Fixing a few cases for missing tsserver

mjbvz · mjbvz · commit db35205c7c35 · 2017-03-03T15:44:45.000-08:00
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
@@ -328,7 +328,11 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 	}
 
 	private get bundledTypeScriptPath(): string {
-		return require.resolve('typescript/lib/tsserver.js');
+		try {
+			return require.resolve('typescript/lib/tsserver.js');
+		} catch (e) {
+			return '';
+		}
 	}
 
 	private get localTypeScriptPath(): string | null {
@@ -392,12 +396,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 
 				this.info(`Using tsserver from location: ${modulePath}`);
 				if (!fs.existsSync(modulePath)) {
-					window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', path.dirname(modulePath)));
-					modulePath = this.bundledTypeScriptPath;
-					if (!fs.existsSync(modulePath)) {
-						window.showErrorMessage(localize('noBundledServerFound', 'VSCode\'s tsserver was deleted by a another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));
+					window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', modulePath ? path.dirname(modulePath) : ''));
+					if (!this.bundledTypeScriptPath) {
+						window.showErrorMessage(localize('noBundledServerFound', 'VSCode\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));
 						return reject(new Error('Could not find bundled tsserver.js'));
 					}
+					modulePath = this.bundledTypeScriptPath;
 				}
 
 				let version = this.getTypeScriptVersion(modulePath);
@@ -485,9 +489,9 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		return this.showVersionPicker(false);
 	}
 
-	private showVersionPicker(firstRun: boolean) {
+	private showVersionPicker(firstRun: boolean): Thenable<string> {
 		const modulePath = this.modulePath || this.globalTypescriptPath;
-		if (!workspace.rootPath) {
+		if (!workspace.rootPath || !modulePath) {
 			return Promise.resolve(modulePath);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,11 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`private get bundledTypeScriptPath(): string {`
`331`		`- return require.resolve('typescript/lib/tsserver.js');`
	`331`	`+ try {`
	`332`	`+ return require.resolve('typescript/lib/tsserver.js');`
	`333`	`+ } catch (e) {`
	`334`	`+ return '';`
	`335`	`+ }`
`332`	`336`	`}`
`333`	`337`
`334`	`338`	`private get localTypeScriptPath(): string \| null {`
`@@ -392,12 +396,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient`
`392`	`396`
`393`	`397`	this.info(`Using tsserver from location: ${modulePath}`);
`394`	`398`	`if (!fs.existsSync(modulePath)) {`
`395`		`- window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', path.dirname(modulePath)));`
`396`		`- modulePath = this.bundledTypeScriptPath;`
`397`		`- if (!fs.existsSync(modulePath)) {`
`398`		`- window.showErrorMessage(localize('noBundledServerFound', 'VSCode\'s tsserver was deleted by a another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));`
	`399`	`+ window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', modulePath ? path.dirname(modulePath) : ''));`
	`400`	`+ if (!this.bundledTypeScriptPath) {`
	`401`	`+ window.showErrorMessage(localize('noBundledServerFound', 'VSCode\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));`
`399`	`402`	`return reject(new Error('Could not find bundled tsserver.js'));`
`400`	`403`	`}`
	`404`	`+ modulePath = this.bundledTypeScriptPath;`
`401`	`405`	`}`
`402`	`406`
`403`	`407`	`let version = this.getTypeScriptVersion(modulePath);`
`@@ -485,9 +489,9 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient`
`485`	`489`	`return this.showVersionPicker(false);`
`486`	`490`	`}`
`487`	`491`
`488`		`- private showVersionPicker(firstRun: boolean) {`
	`492`	`+ private showVersionPicker(firstRun: boolean): Thenable<string> {`
`489`	`493`	`const modulePath = this.modulePath \|\| this.globalTypescriptPath;`
`490`		`- if (!workspace.rootPath) {`
	`494`	`+ if (!workspace.rootPath \|\| !modulePath) {`
`491`	`495`	`return Promise.resolve(modulePath);`
`492`	`496`	`}`
`493`	`497`