Cleanup merged settings and polish jsdoc

dbaeumer · dbaeumer · commit 216c6b8a6dc5 · 2016-06-23T13:43:12.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,5 @@
 		"extensions/**/out/**": true
 	},
 	"tslint.enable": true,
-	"tslint.rulesDirectory": "build/lib/tslint",
-	"typescript.tsdk": "P:\\mseng\\TypeScript\\built\\local"
+	"tslint.rulesDirectory": "build/lib/tslint"
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -1,5 +1,4 @@
 {
-	"autoDiagnostics": true,
 	"compilerOptions": {
 		"module": "amd",
 		"moduleResolution": "classic",
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -2958,7 +2958,8 @@ declare namespace vscode {
 
 		/**
 		 * The absolute file path of the workspace specific directory where the extension
-		 * can store proviate state on disk. The directory might not exist yet.
+		 * can store proviate state on disk. The directory itself might not exist yet. However
+		 * its parent directory will.
 		 *
 		 * Use `workspaceState` or `globalState` to store simple data.
 		 */

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,5 @@`
`15`	`15`	`"extensions//out/": true`
`16`	`16`	`},`
`17`	`17`	`"tslint.enable": true,`
`18`		`- "tslint.rulesDirectory": "build/lib/tslint",`
`19`		`- "typescript.tsdk": "P:\\mseng\\TypeScript\\built\\local"`
	`18`	`+ "tslint.rulesDirectory": "build/lib/tslint"`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2958,7 +2958,8 @@ declare namespace vscode {`
`2958`	`2958`
`2959`	`2959`	`/**`
`2960`	`2960`	`* The absolute file path of the workspace specific directory where the extension`
`2961`		`- * can store proviate state on disk. The directory might not exist yet.`
	`2961`	`+ * can store proviate state on disk. The directory itself might not exist yet. However`
	`2962`	`+ * its parent directory will.`
`2962`	`2963`	`*`
`2963`	`2964`	* Use `workspaceState` or `globalState` to store simple data.
`2964`	`2965`	`*/`