Skip to content

Commit 249b2a1

Browse files
committed
fix: Do not use deprecated rootPath
1 parent 3e483ba commit 249b2a1

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/extensions/cobol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class CobolResolveSubroutineFeature extends ExtensionFeature {
1313
activate (context: vscode.ExtensionContext, capabilities: ServerCapabilities, documentSelector: DocumentSelector): void {
1414
context.subscriptions.push(this.languageClient.onRequest(ResolveCobolSubroutineRequestType, (routineName: string): string | undefined => {
1515
const constantRoutinePaths: Partial<Record<string, string>> = {
16-
'assert-equals': `file:${vscode.workspace.rootPath ?? '/tmp/project'}/deps/assert-equals.cbl`
16+
'assert-equals': `file:${vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '/tmp/project'}/deps/assert-equals.cbl`
1717
}
1818
const contantRoutinePath = constantRoutinePaths[routineName.toLowerCase()]
1919
if (contantRoutinePath != null) {

src/staticOptions.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as vscode from 'vscode'
2-
import * as monaco from 'monaco-editor'
32
import { Middleware } from 'monaco-languageclient'
43
import type { LanguageClientOptions } from './languageClientOptions'
54

@@ -256,9 +255,7 @@ const staticOptions = asLanguageClientOptionsById({
256255
},
257256
initializationOptions: () => ({
258257
configuration: {
259-
uris: [
260-
monaco.Uri.file(vscode.workspace.rootPath!).toString()
261-
],
258+
uris: vscode.workspace.workspaceFolders?.map(folder => folder.uri.toString()),
262259
phpVersion: 7.3,
263260
fileExtensions: [
264261
'php'

0 commit comments

Comments
 (0)