use extensionUri and joinPath instead of asAbsolutePath

jrieken · jrieken · commit bc3b0defe0de · 2020-08-28T14:57:20.000+02:00
diff --git a/extensions/css-language-features/client/src/browser/cssClientMain.ts b/extensions/css-language-features/client/src/browser/cssClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext } from 'vscode';
+import { ExtensionContext, Uri } from 'vscode';
 import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor } from '../cssClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -17,9 +17,9 @@ declare const TextDecoder: {
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
-	const serverMain = context.asAbsolutePath('server/dist/browser/cssServerMain.js');
+	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/cssServerMain.js');
 	try {
-		const worker = new Worker(serverMain);
+		const worker = new Worker(serverMain.toString());
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/html-language-features/client/src/browser/htmlClientMain.ts b/extensions/html-language-features/client/src/browser/htmlClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext } from 'vscode';
+import { ExtensionContext, Uri } from 'vscode';
 import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor } from '../htmlClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -17,9 +17,9 @@ declare const TextDecoder: {
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
-	const serverMain = context.asAbsolutePath('server/dist/browser/htmlServerMain.js');
+	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/cssServerMain.js');
 	try {
-		const worker = new Worker(serverMain);
+		const worker = new Worker(serverMain.toString());
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/json-language-features/client/src/browser/jsonClientMain.ts b/extensions/json-language-features/client/src/browser/jsonClientMain.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtensionContext } from 'vscode';
+import { ExtensionContext, Uri } from 'vscode';
 import { LanguageClientOptions } from 'vscode-languageclient';
 import { startClient, LanguageClientConstructor } from '../jsonClient';
 import { LanguageClient } from 'vscode-languageclient/browser';
@@ -17,9 +17,9 @@ declare function fetch(uri: string, options: any): any;
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
-	const serverMain = context.asAbsolutePath('server/dist/browser/jsonServerMain.js');
+	const serverMain = Uri.joinPath(context.extensionUri, 'server/dist/browser/cssServerMain.js');
 	try {
-		const worker = new Worker(serverMain);
+		const worker = new Worker(serverMain.toString());
 		const newLanguageClient: LanguageClientConstructor = (id: string, name: string, clientOptions: LanguageClientOptions) => {
 			return new LanguageClient(id, name, clientOptions, worker);
 		};
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
@@ -52,7 +52,7 @@ export function activate(
 	const versionProvider = new StaticVersionProvider(
 		new TypeScriptVersion(
 			TypeScriptVersionSource.Bundled,
-			context.asAbsolutePath('dist/browser/typescript-web/tsserver.web.js'),
+			vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript-web/tsserver.web.js').toString(),
 			API.v400));
 
 	const lazyClientHost = createLazyClientHost(context, false, {
@@ -78,4 +78,3 @@ export function activate(
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
-
