feat: look for global .sasjslint file before using default setting

sasjs · Apr 12, 2023 · 448a6c9 · 448a6c9
1 parent 93e027b
commit 448a6c9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/utils/getLintConfig.ts b/src/utils/getLintConfig.ts
@@ -1,16 +1,22 @@
 import * as path from 'path'
+import * as os from 'os'
 import { workspace } from 'vscode'
 import { LintConfig, DefaultLintConfiguration } from '@sasjs/lint'
 import { readFile } from './file'
+import { fileExists } from '@sasjs/utils'
 
 export const getLintConfig = async () => {
   let config = DefaultLintConfiguration
 
-  const lintConfigPath = path.join(process.projectDir, '.sasjslint')
+  let lintConfigPath = path.join(os.homedir(), '.sasjslint')
+
+  if (await fileExists(path.join(process.projectDir, '.sasjslint'))) {
+    lintConfigPath = path.join(process.projectDir, '.sasjslint')
+  }
 
   await readFile(lintConfigPath)
     .then((content) => {
-      config = { ...config, ...JSON.parse(content) }
+      config = JSON.parse(content)
     })
     .catch(() => {
       const extConfig = workspace.getConfiguration('sasjs-for-vscode')