v0.9.3: Fix workspace issue on Linux editorconfig#145

jednano · Apr 11, 2017 · d817060 · d817060
1 parent acd1582
commit d817060
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.9.3
+- Fix workspace issue on Linux [`#145`](https://github.com/editorconfig/editorconfig-vscode/issues/145).
+
 ## 0.9.2
 - Improve/simplify output channel messaging.
 

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "EditorConfig for VS Code",
   "description": "EditorConfig Support for Visual Studio Code",
   "publisher": "EditorConfig",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "icon": "EditorConfig_icon.png",
   "engines": {
     "vscode": "^1.11.0"
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "editorconfig": "^0.13.2",
+    "lodash.compact": "^3.0.1",
     "lodash.get": "^4.4.2"
   },
   "devDependencies": {

diff --git a/src/DocumentWatcher.ts b/src/DocumentWatcher.ts
@@ -1,4 +1,5 @@
 import * as editorconfig from 'editorconfig';
+import * as compact from 'lodash.compact';
 import * as path from 'path';
 import {
 	window,
@@ -93,7 +94,12 @@ class DocumentWatcher implements EditorConfigProvider {
 			return doc.fileName;
 		}
 		const ext = languageExtensionMap[doc.languageId] || doc.languageId;
-		return path.join(workspace.rootPath, `${doc.fileName}.${ext}`);
+		return path.join(
+			...compact([
+				workspace.rootPath,
+				`${doc.fileName}.${ext}`
+			])
+		);
 	}
 
 	public getDefaultSettings() {