do not ignore file configs

stylelint · Feb 11, 2016 · 984a53f · 984a53f
1 parent 3be0f1e
commit 984a53f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -36,12 +36,12 @@
         },
         "stylelint.config": {
           "type": "object",
-          "default": {},
+          "default": null,
           "description": "A stylelint configuration object."
         },
         "stylelint.configOverrides": {
           "type": "object",
-          "default": {},
+          "default": null,
           "description": "A partial stylelint config whose properties override the existing ones."
         }
       }

diff --git a/server.js b/server.js
@@ -36,7 +36,9 @@ function validateAll() {
 }
 
 connection.onInitialize(params => {
-  configBasedir = params.rootPath;
+  if (params.rootPath) {
+    configBasedir = params.rootPath;
+  }
 
   validateAll();
 
@@ -48,8 +50,8 @@ connection.onInitialize(params => {
 });
 connection.onDidChangeConfiguration(params => {
   const settings = params.settings;
-  config = settings.stylelint.config || {};
-  configOverrides = settings.stylelint.configOverrides || {};
+  config = settings.stylelint.config;
+  configOverrides = settings.stylelint.configOverrides;
 
   validateAll();
 });