message of no language server found

daimor · daimor · commit 5265fb6c78ef · 2020-10-08T22:35:41.000+03:00
diff --git a/src/extension.ts b/src/extension.ts
@@ -370,17 +370,11 @@ async function serverManager(): Promise<any> {
   }
 }
 
-async function languageServer(): Promise<any> {
+function languageServer(): vscode.Extension<any> {
   const extId = "intersystems.language-server";
   const extension = vscode.extensions.getExtension(extId);
 
   return extension;
-  // if (extension) {
-  //   if (!extension.isActive) {
-  //     // await extension.activate();
-  //   }
-  //   return extension.exports;
-  // }
 }
 
 export async function activate(context: vscode.ExtensionContext): Promise<any> {
@@ -540,8 +534,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     outputChannel.show(true);
   }
 
-  const languageServerExt = await languageServer();
+  const languageServerExt = languageServer();
   if (!languageServerExt) {
+    outputChannel.appendLine(`The language-server extension was not found.\n`);
+    outputChannel.show(true);
+
     if (vscode.window.activeTextEditor) {
       diagnosticProvider.updateDiagnostics(vscode.window.activeTextEditor.document);
     }

Original file line number	Diff line number	Diff line change
`@@ -370,17 +370,11 @@ async function serverManager(): Promise<any> {`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`-async function languageServer(): Promise<any> {`
	`373`	`+function languageServer(): vscode.Extension<any> {`
`374`	`374`	`const extId = "intersystems.language-server";`
`375`	`375`	`const extension = vscode.extensions.getExtension(extId);`
`376`	`376`
`377`	`377`	`return extension;`
`378`		`- // if (extension) {`
`379`		`- // if (!extension.isActive) {`
`380`		`- // // await extension.activate();`
`381`		`- // }`
`382`		`- // return extension.exports;`
`383`		`- // }`
`384`	`378`	`}`
`385`	`379`
`386`	`380`	`export async function activate(context: vscode.ExtensionContext): Promise<any> {`
`@@ -540,8 +534,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {`
`540`	`534`	`outputChannel.show(true);`
`541`	`535`	`}`
`542`	`536`
`543`		`- const languageServerExt = await languageServer();`
	`537`	`+ const languageServerExt = languageServer();`
`544`	`538`	`if (!languageServerExt) {`
	`539`	+ outputChannel.appendLine(`The language-server extension was not found.\n`);
	`540`	`+ outputChannel.show(true);`
	`541`	`+`
`545`	`542`	`if (vscode.window.activeTextEditor) {`
`546`	`543`	`diagnosticProvider.updateDiagnostics(vscode.window.activeTextEditor.document);`
`547`	`544`	`}`