Skip to content

Commit 00e7b01

Browse files
committed
fix: setup cwd error, fix #4
1 parent 75cba34 commit 00e7b01

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
"@typescript-eslint/eslint-plugin": "^4.13.0",
131131
"@typescript-eslint/parser": "^4.13.0",
132132
"coc-helper": "^0.8.4",
133-
"coc.nvim": "^0.0.80",
133+
"coc.nvim": "^0.0.81-next.3",
134134
"eslint": "^7.18.0",
135135
"ts-loader": "^8.0.14",
136136
"typescript": "^4.1.3",

src/languageSetup.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
RevealOutputChannelOn,
99
ServerOptions,
1010
StreamInfo,
11+
Uri,
1112
window,
1213
workspace,
1314
WorkspaceConfiguration,
@@ -165,11 +166,12 @@ function createLanguageClient(options: {
165166
if (options.tcpPort) {
166167
serverOptions = () => spawnLanguageServerProcessAndConnectViaTcp(options);
167168
} else {
169+
const cwdUri = workspace.workspaceFolders?.[0]?.uri;
168170
serverOptions = {
169171
command: options.startScriptPath,
170172
args: [],
171173
options: {
172-
cwd: workspace.workspaceFolders?.[0]?.uri,
174+
cwd: cwdUri ? Uri.parse(cwdUri).fsPath : undefined,
173175
env: options.env,
174176
}, // TODO: Support multi-root workspaces (and improve support for when no available is available)
175177
};

yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
9292
integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
9393

94-
"@types/extract-zip@^1.6.2":
95-
version "1.6.2"
96-
resolved "https://registry.yarnpkg.com/@types/extract-zip/-/extract-zip-1.6.2.tgz#5c7eb441c41136167a42b88b64051e6260c29e86"
97-
integrity sha1-XH60QcQRNhZ6QriLZAUeYmDCnoY=
98-
9994
"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.6":
10095
version "7.0.6"
10196
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -493,10 +488,10 @@ coc-helper@^0.8.4:
493488
dependencies:
494489
app-root-path "^3.0.0"
495490

496-
coc.nvim@^0.0.80:
497-
version "0.0.80"
498-
resolved "https://registry.yarnpkg.com/coc.nvim/-/coc.nvim-0.0.80.tgz#785145c382660db03f517f9b497900d95cbd0e4f"
499-
integrity sha512-/3vTcnofoAYMrdENrlQmADTzfXX4+PZ0fiM10a39UA37dTR2dpIGi9O469kcIksuunLjToqWG8S45AGx/9wV7g==
491+
coc.nvim@^0.0.81-next.3:
492+
version "0.0.81-next.3"
493+
resolved "https://registry.yarnpkg.com/coc.nvim/-/coc.nvim-0.0.81-next.3.tgz#d71cc13a8a4c6d98133047b799ab7c78ba3a0bf7"
494+
integrity sha512-eKOxzfBhOZ8t7/zpgmDcC1aS8hkTGz8pe/t4ntN/J2G64I0l9j27/P+8HIbPmGS2WgHv9HmNLFqnquC391Xmbw==
500495

501496
color-convert@^1.9.0:
502497
version "1.9.3"

0 commit comments

Comments
 (0)