MERGE develop into MASTER v6.1.0

.github/workflows/E2E.yml

@@ -40,6 +40,11 @@ jobs:
 
       - name: Check solhint version
         run: solhint --version
+
+      - name: Debug fixtures presence
+        run: |
+          ls -R e2e/14-shareable-config/filesystem01/project || true
+          ls -R e2e/14-shareable-config/filesystem04/project || true  
 
       - name: Run E2E Tests
         run: npm run ci:e2e

.gitignore

@@ -1,4 +1,6 @@
+# ignore all node_modules by default
 node_modules/
+
 /.idea/
 test2.sol
 convertLib.sol
@@ -12,3 +14,11 @@ _temp/
 .env
 **/.DS_Store
 solhint*.tgz
+
+# Exception on E2E fixtures' node_modules (they are part of the test data)
+# only allow useful test files in those node_modules
+!e2e/**/node_modules/**/*.js
+!e2e/**/node_modules/**/*.json
+
+# allow test plugins inside e2e fixtures
+!e2e/15-plugins/**

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [6.1.0] - 2026-03-17
+🛠️ Fix: `natspec` rule no longer flags unnamed parameters, which Solidity prohibits documenting with @param (#749)
+
+🛠️ Fix: `natspec` rule and `import-path-check` rules related issues (#750)
+
+🛠️ Fix: scoped package names now supported for shareable configs (#741)
+
+🛠️ Fix: misc minor issues and general polish (#739)
+<br><br>
+
+🧱 Enhancement: added `pluginPaths` config option for resolving plugins from custom locations. 
+Supports editor integrations and external project setups. Failed plugins emit warnings instead of crashing (#751)
+<br><br>
+
+🧹 Chore: bump ajv to 8.18.0
+
+🧹 Chore: bump minimatch to 10.2.4
+
+🧹 Chore: bump loadash to 4.17.23
+
+🧹 Chore: update LICENSE copyright year to 2026 (thanks xiaobei0715!!) (#745)
+<br><br>
+
+✨🛡️ Kudos to our contributors! 🛡️✨
+
+- [xiaobei0715](https://github.com/xiaobei0715)
+
+
 ## [6.0.3] - 2026-01-20
 🛠️ `Fix`: removed unused files, normalized schema for validation, load-rules, base-checker and validator improvements
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 Protofire
+Copyright (c) 2017-2026 Protofire
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -159,6 +159,31 @@ Project ROOT =>
 A full list of all supported rules can be found [here](docs/rules.md).
 <br><br>
 
+
+### Plugins and `pluginPaths`
+
+Solhint resolves plugins using Node resolution from:
+
+1. `process.cwd()` (default behavior, unchanged)
+2. each configured entry in `pluginPaths`
+3. each configured `<pluginPath>/node_modules`
+
+This makes plugin loading work in environments where Solhint runs outside the project folder (for example IDE/editor integrations), while preserving the standard local `node_modules` behavior.
+
+Example:
+
+```json
+{
+  "pluginPaths": ["/some/path"],
+  "plugins": ["myplugin"],
+  "rules": {
+    "myplugin/some-rule": "error"
+  }
+}
+```
+
+If a plugin fails to load, Solhint will warn and continue linting with core rules and any other valid plugins.
+
 ### Ignore Configuration
 You can exclude files from linting using a `.solhintignore` file (name by default) or `--ignore-path` followed by a custom name. 
 It uses the same syntax as `.gitignore`, including support for negation with !.

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM node:20-alpine
 LABEL maintainer="diego.bale@protofire.io" 
-ENV VERSION=6.0.3
+ENV VERSION=6.1.0
 
 RUN npm install -g solhint@"$VERSION"

docs/configuration.md

@@ -44,6 +44,28 @@ node_modules/
 additional-tests.sol
 ```
 
+
+### Plugins and `pluginPaths`
+
+Solhint resolves plugins from `process.cwd()` by default and can also use extra paths from `pluginPaths`.
+
+Resolution paths include:
+
+1. `process.cwd()`
+2. each `pluginPaths` entry
+3. each `<pluginPath>/node_modules`
+
+`pluginPaths` accepts either a string or an array:
+
+```json
+{
+  "pluginPaths": ["/some/path"],
+  "plugins": ["myplugin"]
+}
+```
+
+If one plugin cannot be loaded, Solhint emits a warning and continues linting with core rules and any other valid plugins.
+
 ### Configure linter with comments
 
 You can use comments in the source code to configure solhint in a given line or file.

docs/rules/best-practices/use-natspec.md

@@ -59,7 +59,7 @@ This rule accepts an array of options:
 ### Notes
 - For `internal` or `private` function this rule checks natspec as configured, only if there are tags present. If not, function is skipped.
 - For `external` or `public` function this rule checks natspec as specified in the config.
-- If a function or return value has unnamed parameters (e.g. `function foo(uint256)`), the rule only checks the number of `@param` or `@return` tags, not their names.
+- If a function or return value has unnamed parameters (e.g. `function foo(uint256, uint256 _amount)`), the rule DOES not check ANY of the params/return tags
 - If a function or variable has `@inheritdoc`, the rule skips the validation.
 - The rule supports both `///` and `/** */` style NatSpec comments.
 - If a custom config is provided, it is merged with the default config. Only the overridden fields need to be specified.

docs/rules/miscellaneous/import-path-check.md

@@ -44,7 +44,7 @@ This rule accepts an array of options:
 - If `searchOn` has value, will be concatenated with DEFAULT_LOCATIONS.
 - If config has `extends:recommended` or `all` and rule is overwritten with `searchOn`, values are concatenated with DEFAULT_LOCATIONS.
 
-     *Default Locations:*
+     *DEFAULT_LOCATIONS:*
     - /[`~current-project`]
     - /[`~current-project`]/contracts
     - /[`~current-project`]/src

docs/shareable-configs.md

@@ -4,27 +4,122 @@ Shareable configs are configurations that you can use and extend from. They can
 
 To use a shareable config, you have to add it to your Solhint configuration:
 
-```
+```json
+{
   "extends": ["solhint:recommended", "protofire"]
+}
+```
+
+This example shows the two types of shareable configs that you can use:
+
+- **Built-in Solhint configs**, which start with `solhint:` (e.g. `solhint:recommended`, `solhint:all`)
+- **Shareable configs installed from npm**
+
+
+## Using npm shareable configs
+
+Unscoped shareable configs are npm packages prefixed with `solhint-config-`.
+
+For example, this configuration:
+
+```json
+{
+  "extends": ["protofire"]
+}
+```
+
+Will load the package:
+
+```
+solhint-config-protofire
+```
+
+which must be installed beforehand:
+
+```
+npm install solhint-config-protofire
+```
+
+You can also reference the full package name explicitly:
+
+```json
+{
+  "extends": ["solhint-config-protofire"]
+}
+```
+
+Shareable configs are resolved from the project's `node_modules` directory (the current working directory), even when Solhint is installed globally.
+
+
+## Scoped shareable configs
+
+Solhint also supports **scoped** shareable configs.
+
+Given the npm package:
+
+```
+@scope/solhint-config-myconfig
+```
+
+You can use it in your configuration as:
+
+```json
+{
+  "extends": ["@scope/solhint-config-myconfig"]
+}
+```
+
+For convenience, Solhint also supports the ESLint-style shorthand:
+
+```json
+{
+  "extends": ["@scope/myconfig"]
+}
 ```
 
-This example shows the two types of shareable configs that you can use: the ones included with Solhint, that start with `solhint:`, and the ones that you can install from npm. The latter are packages that are prefixed with `solhint-config-`, so in this case the package would be installed doing `npm install solhint-config-protofire` but used as just `protofire` when adding it.
+Which resolves to:
+
+```
+@scope/solhint-config-myconfig
+```
+
+Note: Only package-level scoped configs are supported (`@scope/name`). Deep paths such as `@scope/name/extra` are not supported.
+
 
 ## Creating your own shareable config
 
 Shareable configs are regular npm packages. There are only two conditions:
 
-- The name of the package must start with `solhint-config-`
-- The package must export a regular object with the same structure as a regular configuration object (i.e. the one in your `.solhint.json`).
+- The package name must start with `solhint-config-`  
+  (for scoped packages: `@scope/solhint-config-*`)
+- The package must export a regular object with the same structure as a standard Solhint configuration (i.e. the one in your `.solhint.json`)
 
 For example, a very minimal `index.js` in this package could be:
 
-```javascript
+```js
 module.exports = {
   rules: {
     'max-line-length': 80
   }
 }
 ```
 
-After creating this package you can publish it to npm to make it available for everyone.
+After creating this package, you can publish it to npm to make it available for everyone.
+
+
+## Configuration inheritance
+
+Solhint supports **hierarchical configuration**.
+
+When linting a file, configurations are merged in the following order:
+
+1. The project root configuration
+2. Each parent directory configuration
+3. The directory containing the file (**highest precedence**)
+
+For each configuration file, any `extends` entries are resolved first, and then all configurations are merged according to directory hierarchy.
+
+Rules and settings defined in deeper directories **override** those from higher-level directories and from extended configs.
+
+In short:  
+**`extends` are resolved first, directory hierarchy is applied after, and the closest config always wins.**

e2e/14-shareable-config/filesystem01/project/.solhint.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@test/demo"]
+}

e2e/14-shareable-config/filesystem01/project/contracts/EmptyBlocks.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract A {
+    function f() public {}
+}

e2e/14-shareable-config/filesystem02/project/.solhint.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@test/base"]
+}

e2e/14-shareable-config/filesystem02/project/contracts/.solhint.json

@@ -0,0 +1,6 @@
+{
+  "rules": {
+    "max-line-length": ["error", 80]
+  }
+}
+

e2e/14-shareable-config/filesystem02/project/contracts/A.sol

@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract A { function f() public { uint x = 1; uint y = 2; uint z = 3; uint w = 4; } function g() public { } }

e2e/14-shareable-config/filesystem03/project/.solhint.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@test/base"]
+}

e2e/14-shareable-config/filesystem03/project/contracts/deep/.solhint.json

@@ -0,0 +1,6 @@
+{
+  "rules": {
+    "max-line-length": ["error", 60],
+    "no-empty-blocks": "off"
+  }
+}

e2e/14-shareable-config/filesystem03/project/contracts/deep/B.sol

@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract B { function g() public { uint x = 1; uint y = 2; uint z = 3; uint w = 4; } function g() public { }}
+

e2e/14-shareable-config/filesystem04/project/.solhint.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["a", "b"]
+}
+

e2e/14-shareable-config/filesystem04/project/contracts/EmptyBlocks.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract C { function f() public { } }
+
+

e2e/14-shareable-config/filesystem05/project/.solhint.json

@@ -0,0 +1,5 @@
+{
+  "extends": ["a", "b"],
+  "rules": { "no-empty-blocks": "off" }
+}
+

e2e/14-shareable-config/filesystem05/project/contracts/EmptyBlocks.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract C { function f() public { } }
+
+

e2e/14-shareable-config/filesystem06/project/.solhint.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["@test/solhint-config-demo"]
+}
+