Merge pull request #553 from AtomLinter/arcanemagus/fix-local-styleli…

…nt-config Use local stylelint for config resolution if available
AtomLinter · Feb 4, 2020 · 6686c77 · 6686c77
2 parents b598700 + 21c1d7f
commit 6686c77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -168,6 +168,10 @@ export function refreshModulesPath(modulesDir) {
 }
 
 function getProjectDir(filePath) {
+  if (!filePath) {
+    // No file (e.g. in the specs)
+    return null;
+  }
   const projectDir = atom.project.relativizePath(filePath)[0];
   return projectDir !== null ? projectDir : path.dirname(filePath);
 }

diff --git a/lib/index.js b/lib/index.js
@@ -7,7 +7,6 @@ import hasValidScope from './validate';
 // Dependencies
 let helpers;
 let dirname;
-let stylelint;
 
 function loadDeps() {
   if (!helpers) {
@@ -16,9 +15,6 @@ function loadDeps() {
   if (!dirname) {
     ({ dirname } = require('path'));
   }
-  if (!stylelint) {
-    stylelint = require('stylelint');
-  }
 }
 
 export default {
@@ -156,6 +152,8 @@ export default {
         }
 
         helpers.startMeasure('linter-stylelint: Create Linter');
+        // Use the project local stylelint to resolve the config if one exists
+        const stylelint = await helpers.getStylelintInstance();
         const stylelintLinter = await stylelint.createLinter();
         helpers.endMeasure('linter-stylelint: Create Linter');