Merge pull request #185 from jedmao/multi-root

v0.12.0 - Support multi-root workspaces

Author: jedmao

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.12.0
+- Support multi-root workspaces [`#174`](https://github.com/editorconfig/editorconfig-vscode/issues/174).
+
 ## 0.11.1
 - Update EditorConfig dependency.
 

package.json

@@ -6,13 +6,18 @@
   "version": "0.11.1",
   "icon": "EditorConfig_icon.png",
   "engines": {
-    "vscode": "^1.11.0"
+    "vscode": "^1.19.2"
   },
   "author": "EditorConfig Team",
   "license": "MIT",
   "categories": [
     "Other"
   ],
+  "keywords": [
+    "editor",
+    "config",
+    "multi-root ready"
+  ],
   "homepage": "https://github.com/editorconfig/editorconfig-vscode/blob/master/README.md",
   "repository": {
     "type": "git",
@@ -32,24 +37,39 @@
   "contributes": {
     "commands": [
       {
-        "command": "vscode.generateeditorconfig",
-        "title": "EditorConfig: Generate"
+        "command": "EditorConfig.generate",
+        "title": "Generate .editorconfig"
       }
-    ]
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "EditorConfig.generate",
+          "when": "explorerResourceIsFolder"
+        }
+      ],
+      "explorer/context": [
+        {
+          "command": "EditorConfig.generate",
+          "when": "explorerResourceIsFolder",
+          "group": "EditorConfig@1"
+        }
+      ]
+    }
   },
   "dependencies": {
     "editorconfig": "^0.15.0",
     "lodash.compact": "^3.0.1",
     "lodash.get": "^4.4.2"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.77",
-    "@types/mocha": "^2.2.43",
-    "@types/node": "^8.0.34",
+    "@types/lodash": "^4.14.93",
+    "@types/mocha": "^2.2.46",
+    "@types/node": "^9.3.0",
     "rimraf": "^2.6.2",
-    "tslint": "^5.7.0",
-    "typescript": "^2.5.3",
-    "vscode": "^1.1.6",
+    "tslint": "^5.9.1",
+    "typescript": "^2.6.2",
+    "vscode": "^1.1.10",
     "vscode-test-utils": "0.0.9"
   },
   "scripts": {

src/DocumentWatcher.ts

@@ -103,7 +103,7 @@ class DocumentWatcher implements EditorConfigProvider {
 		const ext = languageExtensionMap[doc.languageId] || doc.languageId;
 		return path.join(
 			...compact([
-				workspace.rootPath,
+				workspace.getWorkspaceFolder(doc.uri),
 				`${doc.fileName}.${ext}`
 			])
 		);
@@ -126,7 +126,7 @@ class DocumentWatcher implements EditorConfigProvider {
 			return;
 		}
 		const fileName = this.getFileName(doc);
-		const relativePath = workspace.asRelativePath(fileName);
+		const relativePath = workspace.asRelativePath(fileName, true);
 
 		if (this.docToConfigMap[fileName]) {
 			this.log(`${relativePath}: Applying configuration map...`);
@@ -156,7 +156,7 @@ class DocumentWatcher implements EditorConfigProvider {
 		}
 
 		const doc = editor.document;
-		const relativePath = workspace.asRelativePath(doc.fileName);
+		const relativePath = workspace.asRelativePath(doc.fileName, true);
 		const editorconfigSettings = this.getSettingsForDocument(doc);
 
 		if (!editorconfigSettings) {
@@ -176,7 +176,7 @@ class DocumentWatcher implements EditorConfigProvider {
 	}
 
 	private onConfigChanged() {
-		const workspaceConfig = workspace.getConfiguration('editor');
+		const workspaceConfig = workspace.getConfiguration('editor', null);
 		const detectIndentation = workspaceConfig.get<boolean>('detectIndentation');
 
 		this.defaults = (detectIndentation) ? {} : {

src/commands/generateEditorConfig.ts

@@ -2,22 +2,16 @@ import * as fs from 'fs';
 import * as path from 'path';
 import {
 	workspace,
-	window
+	window,
+	Uri
 } from 'vscode';
 
 /**
  * Generate a .editorconfig file in the root of the workspace based on the
  * current vscode settings.
  */
-export function generateEditorConfig() {
-	if (!workspace.rootPath) {
-		window.showInformationMessage(
-			'Please open a folder before generating an .editorconfig file'
-		);
-		return;
-	}
-
-	const editorConfigFile = path.join(workspace.rootPath, '.editorconfig');
+export function generateEditorConfig(uri: Uri) {
+	const editorConfigFile = path.join(uri.fsPath, '.editorconfig');
 
 	fs.stat(editorConfigFile, (err, stats) => {
 
@@ -32,14 +26,14 @@ export function generateEditorConfig() {
 
 		if (stats.isFile()) {
 			window.showErrorMessage(
-				'A .editorconfig file already exists in your workspace.'
+				'An .editorconfig file already exists in this workspace.'
 			);
 		}
 	});
 
 	function writeFile() {
-		const editor = workspace.getConfiguration('editor');
-		const files = workspace.getConfiguration('files');
+		const editor = workspace.getConfiguration('editor', uri);
+		const files = workspace.getConfiguration('files', uri);
 
 		const settingsLines = ['root = true', '', '[*]'];
 		function addSetting(key: string, value?: string | number | boolean): void {

src/editorConfigMain.ts

@@ -37,7 +37,7 @@ export function activate(ctx: ExtensionContext): void {
 
 	// register a command handler to generate a .editorconfig file
 	commands.registerCommand(
-		'vscode.generateeditorconfig',
+		'EditorConfig.generate',
 		generateEditorConfig
 	);
 }