diff --git a/README.md b/README.md index 7124c01..74b10c3 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ gem install rubocop If VSCode market place is not configured in your FLOSS distribution of code (you have Open VSX instead): -1. Go on [VSCode Marketplace](https://marketplace.visualstudio.com/items?itemName=misogi.ruby-rubocop) and clic on the [Download Extension](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/misogi/vsextensions/ruby-rubocop/0.8.5/vspackage) button. +1. Go on [VSCode Marketplace](https://marketplace.visualstudio.com/items?itemName=misogi.ruby-rubocop) and click on the [Download Extension](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/misogi/vsextensions/ruby-rubocop/0.8.5/vspackage) button. 2. Install the extension manually from the CLI: `code --install-extension misogi.ruby-rubocop-0.8.5.vsix` # ChangeLog diff --git a/src/rubocop.ts b/src/rubocop.ts index 0a1ecd1..1888838 100644 --- a/src/rubocop.ts +++ b/src/rubocop.ts @@ -87,13 +87,18 @@ function getCurrentPath(fileUri: vscode.Uri): string { function getCommandArguments(fileName: string): string[] { let commandArguments = ['--stdin', fileName, '--force-exclusion']; const extensionConfig = getConfig(); + if (extensionConfig.configFilePath !== '') { - const found = [extensionConfig.configFilePath] + const expandedConfigFilePath = path.resolve(extensionConfig.configFilePath); + + const found = [expandedConfigFilePath] .concat( (vscode.workspace.workspaceFolders || []).map((ws) => path.join(ws.uri.path, extensionConfig.configFilePath) ) ) + // dedupe + .filter((v, i, a) => a.indexOf(v) === i) .filter((p: string) => fs.existsSync(p)); if (found.length == 0) {