Skip to content

Commit b4d15c9

Browse files
authored
Upgrade to vscode-languageclient 8.0.2 (#1173)
* Upgrade to vscode-languageclient 8.0.2 * Update languageService * Update required vscode version * Upgrade * Update languageService.ts * Upgrade dependencies * Fix lints * Update node-version in github workflows * Update actions * Format document * Update panel.ts
1 parent e7b60a7 commit b4d15c9

19 files changed

Lines changed: 429 additions & 314 deletions

File tree

.github/workflows/main.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
os: [macos-latest, ubuntu-latest, windows-latest]
1111
runs-on: ${{ matrix.os }}
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-node@v1
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-node@v3
1515
with:
16-
node-version: "13.x"
16+
node-version: 16
1717
- run: yarn install
1818
- name: Run tests
1919
uses: GabrielBB/xvfb-action@v1.0
@@ -24,29 +24,29 @@ jobs:
2424
env:
2525
VSIX_FILE: vscode-R.vsix
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
- run: node $SCRIPT_DIR/enableWebpack.js
2929
- run: yarn install
3030
- uses: lannonbr/vsce-action@master
3131
with:
3232
args: "package -o $VSIX_FILE"
33-
- uses: actions/upload-artifact@v1
33+
- uses: actions/upload-artifact@v3
3434
with:
3535
name: ${{ env.VSIX_FILE }}
3636
path: ${{ env.VSIX_FILE }}
3737
eslint:
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
41-
- uses: actions/setup-node@v1
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
4242
with:
43-
node-version: "13.x"
43+
node-version: 16
4444
- run: yarn install
4545
- run: yarn run lint
4646
markdownlint-cli:
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
5050
- uses: nosborn/github-action-markdown-cli@v1.1.1
5151
with:
5252
files: .
@@ -57,7 +57,7 @@ jobs:
5757
container:
5858
image: rocker/tidyverse:latest
5959
steps:
60-
- uses: actions/checkout@v2
60+
- uses: actions/checkout@v3
6161
- name: Install apt-get dependencies
6262
run: |
6363
apt-get update
@@ -73,10 +73,10 @@ jobs:
7373
devreplay:
7474
runs-on: ubuntu-latest
7575
steps:
76-
- uses: actions/checkout@v2
77-
- uses: actions/setup-node@v1
76+
- uses: actions/checkout@v3
77+
- uses: actions/setup-node@v3
7878
with:
79-
node-version: "13.x"
79+
node-version: 16
8080
- run: yarn install
8181
- name: Run devreplay
8282
run: ./node_modules/.bin/devreplay ./src devreplay.json

.github/workflows/pre-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- run: node $SCRIPT_DIR/enableWebpack.js
1919
- run: yarn install
2020
- uses: lannonbr/vsce-action@master
2121
with:
2222
args: "package -o $FILE_OUT"
23-
- uses: actions/upload-artifact@v1
23+
- uses: actions/upload-artifact@v3
2424
with:
2525
name: "${{ env.FILE_OUT }}"
2626
path: "${{ env.FILE_OUT }}"
@@ -38,7 +38,7 @@ jobs:
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
- name: Download artifacts
41-
uses: actions/download-artifact@v2
41+
uses: actions/download-artifact@v3
4242
with:
4343
path: "artifacts/"
4444
- name: Upload artifacts

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- run: node $SCRIPT_DIR/enableWebpack.js
1919
- run: yarn install
2020
- uses: lannonbr/vsce-action@master
@@ -23,7 +23,7 @@ jobs:
2323
- name: Identify output file # can be retrieved as steps.filenames.outputs.file_out
2424
id: filenames
2525
run: echo "::set-output name=file_out::$(ls | grep "^.*\.vsix$" | head -1)"
26-
- uses: actions/upload-artifact@v1
26+
- uses: actions/upload-artifact@v3
2727
with:
2828
name: ${{ steps.filenames.outputs.file_out }}
2929
path: ${{ steps.filenames.outputs.file_out }}
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Download artifacts
38-
uses: actions/download-artifact@v2
38+
uses: actions/download-artifact@v3
3939
with:
4040
path: "artifacts/"
4141
- name: Get version from tag
@@ -55,7 +55,7 @@ jobs:
5555
timeout-minutes: 30
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v3
5959
- run: node $SCRIPT_DIR/enableWebpack.js
6060
- run: yarn install
6161
# - name: Publish to Open VSX Registry

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"R Markdown"
2727
],
2828
"engines": {
29-
"vscode": "^1.60.0"
29+
"vscode": "^1.67.0"
3030
},
3131
"activationEvents": [
3232
"onLanguage:r",
@@ -1908,28 +1908,28 @@
19081908
"@types/fs-extra": "^9.0.11",
19091909
"@types/js-yaml": "^4.0.2",
19101910
"@types/mocha": "^8.2.2",
1911-
"@types/node": "^14.17.3",
1911+
"@types/node": "^16.11.7",
19121912
"@types/node-fetch": "^2.5.10",
19131913
"@types/showdown": "^1.9.3",
1914-
"@types/vscode": "^1.60.0",
1914+
"@types/vscode": "^1.67.0",
19151915
"@types/winreg": "^1.2.31",
19161916
"@types/ws": "^7.4.4",
1917-
"@typescript-eslint/eslint-plugin": "4.25.0",
1918-
"@typescript-eslint/parser": "4.25.0",
1917+
"@typescript-eslint/eslint-plugin": "^5.30.0",
1918+
"@typescript-eslint/parser": "^5.30.0",
19191919
"copy-webpack-plugin": "^9.0.0",
19201920
"devreplay": "^1.9.31",
19211921
"eslint": "^7.28.0",
19221922
"eslint-plugin-jsdoc": "^35.1.3",
1923-
"mocha": "^8.4.0",
1924-
"ts-loader": "^9.2.3",
1925-
"typescript": "^4.3.2",
1923+
"mocha": "^9.1.0",
1924+
"ts-loader": "^9.3.1",
1925+
"typescript": "^4.7.2",
19261926
"vscode-test": "^1.5.2",
19271927
"webpack": "^5.38.1",
19281928
"webpack-cli": "^4.7.2",
19291929
"yamljs": "^0.3.0"
19301930
},
19311931
"dependencies": {
1932-
"ag-grid-community": "^28.0.0",
1932+
"ag-grid-community": "^28.1.1",
19331933
"cheerio": "1.0.0-rc.10",
19341934
"crypto": "^1.0.1",
19351935
"ejs": "^3.1.7",
@@ -1942,7 +1942,7 @@
19421942
"node-fetch": "^2.6.7",
19431943
"popper.js": "^1.16.1",
19441944
"showdown": "^1.9.1",
1945-
"vscode-languageclient": "^7.0.0",
1945+
"vscode-languageclient": "^8.0.2",
19461946
"vsls": "^1.0.4753",
19471947
"winreg": "^1.2.4",
19481948
"ws": "^7.4.6"

src/extension.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
144144
// (help related commands are registered in rHelp.initializeHelp)
145145
};
146146
for (const key in commands) {
147+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
147148
context.subscriptions.push(vscode.commands.registerCommand(key, commands[key]));
148149
}
149150

src/helpViewer/helpProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export class AliasProvider {
241241
// try to make new aliases (returns undefined if unsuccessful):
242242
const newAliases = await this.makeAllAliases();
243243
this.aliases = newAliases;
244-
this.persistentState?.update('r.helpPanel.cachedAliases', newAliases);
244+
await this.persistentState?.update('r.helpPanel.cachedAliases', newAliases);
245245
return newAliases;
246246
}
247247

src/helpViewer/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
12
/* eslint-disable @typescript-eslint/no-explicit-any */
23

34
import * as vscode from 'vscode';

0 commit comments

Comments
 (0)