refactor: replace extensionPath with extensionUri

src/commands.ts

@@ -27,7 +27,7 @@ export const COMMANDS = [
   },
 ] as const
 
-export type CommandDeps = Pick<ExtensionContext, 'extensionPath'>
+export type CommandDeps = Pick<ExtensionContext, 'extensionUri'>
 
 export function getTargetDocumentUri(
   ...args: readonly any[]

src/designer/create-ui.ts

@@ -10,7 +10,7 @@ import type { ErrorResult, SuccessResult } from '../types'
 import { notNil } from '../utils'
 
 export async function createUi(
-  { extensionPath }: CommandDeps,
+  { extensionUri }: CommandDeps,
   ...args: any[]
 ): Promise<CreateUiResult> {
   const targetDocumentUriResult = getTargetDocumentUri(...args)
@@ -21,7 +21,7 @@ export async function createUi(
 
   const getToolCommandResult = await getToolCommand({
     tool: 'designer',
-    extensionPath,
+    extensionUri,
     resource: uri,
   })
 

src/designer/edit-ui.ts

@@ -6,7 +6,7 @@ import { getToolCommand } from '../tool-utils'
 import type { ErrorResult, SuccessResult } from '../types'
 
 export async function editUi(
-  { extensionPath }: CommandDeps,
+  { extensionUri }: CommandDeps,
   ...args: any[]
 ): Promise<EditUiResult> {
   const targetDocumentUriResult = getTargetDocumentUri(...args)
@@ -17,7 +17,7 @@ export async function editUi(
 
   const getToolCommandResult = await getToolCommand({
     tool: 'designer',
-    extensionPath,
+    extensionUri,
     resource: uiFile,
   })
 

src/extension.ts

@@ -16,27 +16,27 @@ export async function activate(context: ExtensionContext) {
 
   registerUicLiveExecution({
     subscriptions: context.subscriptions,
-    extensionPath: context.extensionPath,
+    extensionUri: context.extensionUri,
     onResultReceived,
   })
 
   registerQmlLanguageServer({
     subscriptions: context.subscriptions,
-    extensionPath: context.extensionPath,
+    extensionUri: context.extensionUri,
     outputChannel,
     onResult: onResultReceived,
   })
 }
 
-function registerCommands({ extensionPath, subscriptions }: ExtensionContext) {
+function registerCommands({ extensionUri, subscriptions }: ExtensionContext) {
   return COMMANDS.map(command =>
     subscriptions.push(
       commands.registerCommand(
         `${EXTENSION_NAMESPACE}.${command.name}`,
         async (...args) => {
           try {
             return onResultReceived(
-              await command.callback({ extensionPath }, ...args),
+              await command.callback({ extensionUri }, ...args),
             )
           } catch (e) {
             return onResultReceived({

src/python.ts

@@ -7,7 +7,7 @@ import { notNil } from './utils'
 
 export async function resolveScriptCommand({
   tool,
-  extensionPath,
+  extensionUri,
   resource,
 }: ResolveScriptCommandArgs): Promise<ResolveScriptCommandResult> {
   const pythonInterpreterPathResult = await getPythonInterpreterPath(resource)
@@ -16,7 +16,7 @@ export async function resolveScriptCommand({
       kind: 'Success',
       value: [
         ...pythonInterpreterPathResult.value,
-        path.join(extensionPath, 'python', 'scripts', `${tool}.py`),
+        path.join(extensionUri.fsPath, 'python', 'scripts', `${tool}.py`),
       ],
     }
   }
@@ -26,7 +26,7 @@ export async function resolveScriptCommand({
 
 export type ResolveScriptCommandArgs = {
   readonly tool: SupportedTool
-  readonly extensionPath: string
+  readonly extensionUri: URI
   readonly resource: URI | undefined
 }
 

src/qmlls/client.ts

@@ -8,14 +8,15 @@ import {
   LanguageClient,
   RevealOutputChannelOn,
 } from 'vscode-languageclient/node'
+import type { URI } from 'vscode-uri'
 import { wrapAndJoinCommandArgsWithQuotes } from '../run'
 import { getToolCommand } from '../tool-utils'
 import type { ErrorResult, SuccessResult } from '../types'
 import { withConcatMap } from '../utils'
 
 export async function registerQmlLanguageServer({
   subscriptions,
-  extensionPath,
+  extensionUri,
   outputChannel,
   onResult,
 }: RegisterQmlLanguageServerArgs) {
@@ -43,7 +44,7 @@ export async function registerQmlLanguageServer({
     await stopClient()
 
     const startClientResult = await startClient({
-      extensionPath,
+      extensionUri,
       outputChannel,
     })
 
@@ -60,18 +61,18 @@ export async function registerQmlLanguageServer({
 
 type RegisterQmlLanguageServerArgs = {
   readonly subscriptions: Disposable[]
-  readonly extensionPath: string
+  readonly extensionUri: URI
   readonly outputChannel: OutputChannel
   readonly onResult: (result: StartClientResult) => void
 }
 
 async function startClient({
-  extensionPath,
+  extensionUri,
   outputChannel,
 }: StartClientArgs): Promise<StartClientResult> {
   const getToolCommandResult = await getToolCommand({
     tool: 'qmlls',
-    extensionPath,
+    extensionUri,
     resource: undefined,
   })
 
@@ -105,7 +106,7 @@ async function startClient({
 }
 
 type StartClientArgs = {
-  readonly extensionPath: string
+  readonly extensionUri: URI
   readonly outputChannel: OutputChannel
 }
 

src/rcc/compile-resource.ts

@@ -6,7 +6,7 @@ import { getToolCommand } from '../tool-utils'
 import type { ErrorResult, SuccessResult } from '../types'
 
 export async function compileResource(
-  { extensionPath }: CommandDeps,
+  { extensionUri }: CommandDeps,
   ...args: any[]
 ): Promise<CompileResourceResult> {
   const targetDocumentUriResult = getTargetDocumentUri(...args)
@@ -17,7 +17,7 @@ export async function compileResource(
 
   const getToolCommandResult = await getToolCommand({
     tool: 'rcc',
-    extensionPath,
+    extensionUri,
     resource: qrcFile,
   })
 

src/test/suite/python.test.ts

@@ -15,7 +15,7 @@ suite('python', () => {
   suite('resolveScriptCommand', () => {
     const args: ResolveScriptCommandArgs = {
       tool: 'qmlls',
-      extensionPath: 'xyz',
+      extensionUri: URI.file('file:///xyz'),
       resource: URI.file('file:///abc'),
     }
 
@@ -50,7 +50,7 @@ suite('python', () => {
             value: [
               ...mockPythonExecCommand,
               path.join(
-                args.extensionPath,
+                args.extensionUri.fsPath,
                 'python',
                 'scripts',
                 `${args.tool}.py`,
@@ -83,7 +83,7 @@ suite('python', () => {
               value: [
                 mockDefaultInterpreterPath,
                 path.join(
-                  args.extensionPath,
+                  args.extensionUri.fsPath,
                   'python',
                   'scripts',
                   `${args.tool}.py`,

src/test/suite/tool-utils.test.ts

@@ -27,7 +27,7 @@ suite('tool-utils', () => {
 
         result = await getToolCommand({
           tool: 'rcc',
-          extensionPath: '',
+          extensionUri: URI.file('file:///xyz'),
           resource: mockResource,
         })
       })
@@ -67,7 +67,7 @@ suite('tool-utils', () => {
         test('should return path with options', async () => {
           result = await getToolCommand({
             tool: 'rcc',
-            extensionPath: '',
+            extensionUri: URI.file('file:///xyz'),
             resource: mockResource,
           })
 
@@ -90,7 +90,7 @@ suite('tool-utils', () => {
         test('should return path with options', async () => {
           result = await getToolCommand({
             tool: 'rcc',
-            extensionPath: '',
+            extensionUri: URI.file('file:///xyz'),
             resource: mockResource,
           })
 

src/tool-utils.ts

@@ -6,7 +6,7 @@ import type { ErrorResult, SuccessResult, SupportedTool } from './types'
 
 export async function getToolCommand({
   tool,
-  extensionPath,
+  extensionUri,
   resource,
 }: GetToolCommandArgs): Promise<GetToolCommandResult> {
   const configToolOptions = getOptionsFromConfig({ tool, resource })
@@ -21,7 +21,7 @@ export async function getToolCommand({
 
   const resolveScriptCommandResult = await resolveScriptCommand({
     tool,
-    extensionPath,
+    extensionUri,
     resource,
   })
 
@@ -39,7 +39,7 @@ export async function getToolCommand({
 
 type GetToolCommandArgs = {
   readonly tool: SupportedTool
-  readonly extensionPath: string
+  readonly extensionUri: URI
   readonly resource: URI | undefined
 }
 

src/uic/compile-ui.ts

@@ -6,7 +6,7 @@ import { getToolCommand } from '../tool-utils'
 import type { ErrorResult, SuccessResult } from '../types'
 
 export async function compileUi(
-  { extensionPath }: CommandDeps,
+  { extensionUri }: CommandDeps,
   ...args: any[]
 ): Promise<CompileUiResult> {
   const targetDocumentUriResult = getTargetDocumentUri(...args)
@@ -17,7 +17,7 @@ export async function compileUi(
 
   const getToolCommandResult = await getToolCommand({
     tool: 'uic',
-    extensionPath,
+    extensionUri,
     resource: uiFile,
   })
 

src/uic/uic-live-execution.ts

@@ -7,34 +7,30 @@ import type { ErrorResult, SuccessResult } from '../types'
 import { compileUi } from './compile-ui'
 
 export function registerUicLiveExecution({
-  extensionPath,
+  extensionUri,
   subscriptions,
   onResultReceived,
 }: RegisterUicLiveExecutionArgs) {
   const watcher = workspace.createFileSystemWatcher('**/*.ui')
   watcher.onDidChange(async uri =>
-    onResultReceived(
-      await onUiFileUpdated({ uri, extensionPath: extensionPath }),
-    ),
+    onResultReceived(await onUiFileUpdated({ uri, extensionUri })),
   )
   watcher.onDidCreate(async uri =>
-    onResultReceived(
-      await onUiFileUpdated({ uri, extensionPath: extensionPath }),
-    ),
+    onResultReceived(await onUiFileUpdated({ uri, extensionUri })),
   )
   subscriptions.push(watcher)
 }
 
 type RegisterUicLiveExecutionArgs = Pick<
   ExtensionContext,
-  'subscriptions' | 'extensionPath'
+  'subscriptions' | 'extensionUri'
 > & {
   readonly onResultReceived: (result: OnUiFileUpdatedResult) => void
 }
 
 async function onUiFileUpdated({
   uri,
-  extensionPath,
+  extensionUri,
 }: OnUiFileUpdatedArgs): Promise<OnUiFileUpdatedResult> {
   const enabled =
     workspace
@@ -43,11 +39,11 @@ async function onUiFileUpdated({
 
   if (!enabled) return { kind: 'Success', value: 'Live execution disabled' }
 
-  return compileUi({ extensionPath }, uri)
+  return compileUi({ extensionUri }, uri)
 }
 
 type OnUiFileUpdatedArgs = {
-  readonly extensionPath: string
+  readonly extensionUri: URI
   readonly uri: URI
 }