Fixes #22

microsoft · Jan 25, 2016 · 34bbbf5 · 34bbbf5
1 parent 08e65c0
commit 34bbbf5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/eslint-server/.vscode/launch.json b/eslint-server/.vscode/launch.json
@@ -11,7 +11,7 @@
 			// Port to attach to.
 			"port": 6004,
 			"sourceMaps": true,
-			"outDir": "../eslint/server"
+			"outDir": "${workspaceRoot}/../eslint/server"
 		}
 	]
 }
diff --git a/eslint-server/.vscode/settings.json b/eslint-server/.vscode/settings.json
@@ -3,5 +3,6 @@
 	"javascript.validate.enable": false,
 	"files.trimTrailingWhitespace": true,
 	"editor.insertSpaces": false,
-	"editor.tabSize": 4
+	"editor.tabSize": 4,
+	"tslint.enable": false
 }
diff --git a/eslint-server/src/server.ts b/eslint-server/src/server.ts
@@ -49,6 +49,7 @@ function makeDiagnostic(problem: ESLintProblem): Diagnostic {
 	return {
 		message: `${problem.message} (${problem.ruleId})`,
 		severity: convertSeverity(problem.severity),
+		source: 'eslint',
 		range: {
 			start: { line: problem.line - 1, character: problem.column - 1 },
 			end: { line: problem.line - 1, character: problem.column - 1 }

diff --git a/eslint/.vscode/launch.json b/eslint/.vscode/launch.json
@@ -10,7 +10,7 @@
 			"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outDir": "out",
+			"outDir": "${workspaceRoot}/out",
 			"preLaunchTask": "npm"
 		}
 	]