Skip to content

Commit 3a3a31b

Browse files
sean-mcmanussean-mcmanus
committed
Merge branch 'main' into seanmcm/1_18_3_release
2 parents ef04f02 + 5504bdf commit 3a3a31b

File tree

473 files changed

+24458
-8120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

473 files changed

+24458
-8120
lines changed

‎.github/actions/package-lock.json‎

Lines changed: 6488 additions & 3326 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"eslint-plugin-prettier": "^4.2.1",
3333
"husky": "^8.0.1",
3434
"mocha": "^10.0.0",
35-
"mongodb": "^4.8.1",
35+
"mongodb": "^4.17.0",
3636
"nock": "^13.2.9",
3737
"prettier": "2.7.1",
3838
"ts-node": "^10.9.1",

‎.github/workflows/ci_linux.yml‎

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,14 @@
1-
name: CI (Linux)
2-
3-
on:
4-
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
8-
9-
jobs:
10-
build:
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- uses: actions/checkout@v3
15-
16-
- name: Use Node.js 16
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: 16
20-
21-
- name: Install Dependencies
22-
run: yarn install
23-
working-directory: Extension
24-
25-
- name: Compile Sources
26-
run: yarn run compile
27-
working-directory: Extension
28-
29-
- name: Run Linter
30-
run: yarn run lint
31-
working-directory: Extension
32-
33-
- name: Compile Test Sources
34-
run: yarn run pretest
35-
working-directory: Extension
36-
37-
- name: Run unit tests
38-
uses: GabrielBB/[email protected]
39-
with:
40-
run: yarn run unitTests
41-
working-directory: Extension
42-
43-
# - name: Run languageServer integration tests
44-
# uses: GabrielBB/[email protected]
45-
# with:
46-
# run: yarn run integrationTests
47-
# working-directory: Extension
1+
name: CI (Linux)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
job:
11+
uses: ./.github/workflows/job-compile-and-test.yml
12+
with:
13+
runner-env: ubuntu-22.04
14+
platform: linux

‎.github/workflows/ci_mac.yml‎

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,15 @@
1-
name: CI (Mac)
2-
3-
on:
4-
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
8-
9-
jobs:
10-
build:
11-
runs-on: macos-latest
12-
13-
steps:
14-
- uses: actions/checkout@v3
15-
16-
- name: Use Node.js 16
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: 16
20-
21-
- name: Install Dependencies
22-
run: yarn install --network-timeout 100000
23-
working-directory: Extension
24-
25-
- name: Compile Sources
26-
run: yarn run compile
27-
working-directory: Extension
28-
29-
- name: Run Linter
30-
run: yarn run lint
31-
working-directory: Extension
32-
33-
- name: Compile Test Sources
34-
run: yarn run pretest
35-
working-directory: Extension
36-
37-
- name: Run unit tests
38-
uses: GabrielBB/[email protected]
39-
with:
40-
run: yarn run unitTests
41-
working-directory: Extension
42-
43-
# - name: Run languageServer integration tests
44-
# uses: GabrielBB/[email protected]
45-
# with:
46-
# run: yarn run integrationTests
47-
# working-directory: Extension
1+
name: CI (Mac)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
job:
11+
uses: ./.github/workflows/job-compile-and-test.yml
12+
with:
13+
runner-env: macos-12
14+
platform: mac
15+
yarn-args: --network-timeout 100000

‎.github/workflows/ci_windows.yml‎

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,14 @@
1-
name: CI (Windows)
2-
3-
on:
4-
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
8-
9-
jobs:
10-
build:
11-
runs-on: windows-latest
12-
13-
steps:
14-
- uses: actions/checkout@v3
15-
16-
- name: Use Node.js 16
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: 16
20-
21-
- name: Install Dependencies
22-
run: yarn install
23-
working-directory: Extension
24-
25-
- name: Compile Sources
26-
run: yarn run compile
27-
working-directory: Extension
28-
29-
- name: Run Linter
30-
run: yarn run lint
31-
working-directory: Extension
32-
33-
- name: Compile Test Sources
34-
run: yarn run pretest
35-
working-directory: Extension
36-
37-
- name: Run unit tests
38-
run: yarn run unitTests
39-
working-directory: Extension
40-
41-
# - name: Run languageServer integration tests
42-
# run: yarn run integrationTests
43-
# working-directory: Extension
1+
name: CI (Windows)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
job:
11+
uses: ./.github/workflows/job-compile-and-test.yml
12+
with:
13+
runner-env: windows-2022
14+
platform: windows

‎.github/workflows/job-compile-and-test.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Reuable workflow for compiling and testing extension.
2+
name: Compile and test extension
3+
4+
on:
5+
workflow_call:
6+
inputs:
7+
runner-env:
8+
required: true
9+
type: string
10+
platform:
11+
# Expects 'mac', 'linux', or 'windows'
12+
required: true
13+
type: string
14+
yarn-args:
15+
type: string
16+
17+
jobs:
18+
build:
19+
runs-on: ${{ inputs.runner-env }}
20+
21+
steps:
22+
- uses: actions/checkout@v3
23+
24+
- name: Use Node.js 16
25+
uses: actions/setup-node@v3
26+
with:
27+
node-version: 16
28+
29+
- name: Install Dependencies
30+
run: yarn install ${{ inputs.yarn-args }}
31+
working-directory: Extension
32+
33+
- name: Compile Sources
34+
run: yarn run compile
35+
working-directory: Extension
36+
37+
- name: Run Linter
38+
run: yarn run lint
39+
working-directory: Extension
40+
41+
- name: Run unit tests
42+
run: yarn test
43+
working-directory: Extension
44+
45+
# NOTE : We can't run the test that require the native binary files
46+
# yet -- there will be an update soon that allows the tester to
47+
# acquire them on-the-fly
48+
# - name: Run languageServer integration tests
49+
# if: ${{ inputs.platform == 'windows' }}
50+
# run: yarn test --scenario=SingleRootProject
51+
# working-directory: Extension
52+
53+
# - name: Run E2E IntelliSense features tests
54+
# if: ${{ inputs.platform == 'windows' }}
55+
# run: yarn test --scenario=MultirootDeadlockTest
56+
# working-directory: Extension
57+
58+
# NOTE: For mac/linux run the tests with xvfb-action for UI support.
59+
# Another way to start xvfb https://github.com/microsoft/vscode-test/blob/master/sample/azure-pipelines.yml
60+
61+
# - name: Run languageServer integration tests (xvfb)
62+
# if: ${{ inputs.platform == 'mac' || inputs.platform == 'linux' }}
63+
# uses: coactions/setup-xvfb@v1
64+
# with:
65+
# run: yarn test --scenario=SingleRootProject
66+
# working-directory: Extension
67+
68+
# - name: Run E2E IntelliSense features tests (xvfb)
69+
# if: ${{ inputs.platform == 'mac' || inputs.platform == 'linux' }}
70+
# uses: coactions/setup-xvfb@v1
71+
# with:
72+
# run: yarn test --scenario=MultirootDeadlockTest
73+
# working-directory: Extension

‎Extension/.eslintignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
*.js
2-
test/**/index.ts
3-
test/**/runTest.ts
4-
tools/prepublish.js
2+
3+
dist/
54
vscode*.d.ts

‎Extension/.eslintrc.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
22
"extends": [
33
"eslint:recommended",
4-
"plugin:@typescript-eslint/eslint-recommended"
5-
//"plugin:@typescript-eslint/strict", // I want to enable this. Lots of little changes will happen.
4+
"plugin:@typescript-eslint/eslint-recommended",
5+
"plugin:@typescript-eslint/strict",
66
],
77
"env": {
88
"browser": true,
@@ -11,7 +11,7 @@ module.exports = {
1111
},
1212
"parser": "@typescript-eslint/parser",
1313
"parserOptions": {
14-
"project": "tsconfig.json",
14+
"project": ["tsconfig.json", ".scripts/tsconfig.json"],
1515
"ecmaVersion": 2022,
1616
"sourceType": "module",
1717
"warnOnUnsupportedTypeScriptVersion": false,
@@ -59,11 +59,17 @@ module.exports = {
5959
}
6060
}
6161
],
62+
"@typescript-eslint/no-explicit-any": "off",
63+
"@typescript-eslint/no-extraneous-class": "off",
6264
"no-case-declarations": "off",
6365
"no-useless-escape": "off",
6466
"no-floating-decimal": "error",
6567
"keyword-spacing": ["error", { "before": true, "overrides": { "this": { "before": false } } }],
6668
"arrow-spacing": ["error", { "before": true, "after": true }],
69+
"semi-spacing": ["error", { "before": false, "after": true }],
70+
"no-extra-parens": ["error", "all", { "nestedBinaryExpressions": false, "ternaryOperandBinaryExpressions": false }],
71+
"@typescript-eslint/no-array-constructor": "error",
72+
"@typescript-eslint/no-useless-constructor": "error",
6773
"@typescript-eslint/no-for-in-array": "error",
6874
"@typescript-eslint/no-misused-new": "error",
6975
"@typescript-eslint/no-misused-promises": "error",
@@ -82,6 +88,7 @@ module.exports = {
8288
"@typescript-eslint/unified-signatures": "error",
8389
"@typescript-eslint/no-floating-promises": "error",
8490
"@typescript-eslint/method-signature-style": ["error", "method"],
91+
"@typescript-eslint/space-infix-ops": "error",
8592
"no-unused-vars": "off",
8693
"@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
8794
"@typescript-eslint/no-unnecessary-boolean-literal-compare": "error",
@@ -110,16 +117,19 @@ module.exports = {
110117
"no-fallthrough": "error",
111118
"no-invalid-this": "error",
112119
"no-irregular-whitespace": "error",
120+
"rest-spread-spacing": ["error", "never"],
113121
"no-multiple-empty-lines": ["error", { "max": 1, "maxEOF": 1, "maxBOF": 0 }],
114122
"no-new-wrappers": "error",
115123
"no-return-await": "error",
116124
"no-sequences": "error",
117125
"no-sparse-arrays": "error",
118126
"no-trailing-spaces": "error",
127+
"no-multi-spaces": "error",
119128
"no-undef-init": "error",
120129
"no-unsafe-finally": "error",
121130
"no-unused-expressions": "error",
122131
"no-unused-labels": "error",
132+
"space-before-blocks": "error",
123133
"no-var": "error",
124134
"one-var": [
125135
"error",

‎Extension/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ localized_string_ids.h
3434
src/nativeStrings.ts
3535

3636
vscode*.d.ts
37+
.scripts/_*

0 commit comments

Comments
 (0)