Skip to content

Commit c18825b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into BackgroundAnalysisOptions
2 parents 25650eb + 95bb3ac commit c18825b

File tree

467 files changed

+26289
-17901
lines changed

Some content is hidden

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

467 files changed

+26289
-17901
lines changed

.eslintrc.js

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
module.exports = {
2+
env: {
3+
node: true
4+
},
5+
extends: [
6+
"eslint:recommended",
7+
"plugin:@typescript-eslint/recommended"
8+
],
9+
parser: "@typescript-eslint/parser",
10+
parserOptions: {
11+
project: true,
12+
tsconfigRootDir: __dirname,
13+
},
14+
plugins: [
15+
"@typescript-eslint",
16+
"unicorn",
17+
"header",
18+
"prettier"
19+
],
20+
root: true,
21+
rules: {
22+
"@typescript-eslint/no-explicit-any": "off",
23+
"@typescript-eslint/no-non-null-assertion": "off",
24+
"@typescript-eslint/semi": ["error", "always"],
25+
// Allow unused vars if prefixed by _
26+
"@typescript-eslint/no-unused-vars": [
27+
"warn",
28+
{
29+
"argsIgnorePattern": "^_",
30+
"varsIgnorePattern": "^_",
31+
"caughtErrorsIgnorePattern": "^_"
32+
}
33+
],
34+
"@typescript-eslint/no-namespace": "off",
35+
"@typescript-eslint/promise-function-async": "error",
36+
"curly": "error",
37+
"prettier/prettier": [ "error", { "endOfLine": "auto" } ],
38+
"unicorn/filename-case": [
39+
"error",
40+
{
41+
"case": "camelCase",
42+
"ignore": [
43+
"I[A-Z].*\\.ts$",
44+
"vscode-tasks\\.d\\.ts"
45+
]
46+
}
47+
],
48+
"header/header": [ 2, "block", [
49+
"---------------------------------------------------------------------------------------------",
50+
" * Copyright (c) Microsoft Corporation. All rights reserved.",
51+
" * Licensed under the MIT License. See License.txt in the project root for license information.",
52+
" *--------------------------------------------------------------------------------------------"
53+
]]
54+
},
55+
ignorePatterns: [
56+
"out/",
57+
"dist/",
58+
"wallaby.js",
59+
"webpack.config.js",
60+
".eslintrc.js",
61+
"**/*.d.ts"
62+
],
63+
};

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
out
2+
dist

.prettierrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"singleQuote": true
2+
"trailingComma": "es5",
3+
"tabWidth": 4,
4+
"semi": true,
5+
"singleQuote": true,
6+
"endOfLine":"auto"
37
}

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"esbenp.prettier-vscode"
5+
]
6+
}

.vscode/launch.json

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
"request": "launch",
4242
"runtimeExecutable": "${execPath}",
4343
"args": [
44-
"--disable-extensions",
44+
// Create a temp profile that has no extensions / user settings.
45+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
46+
"--profile-temp",
4547
"--extensionDevelopmentPath=${workspaceRoot}",
4648
"--extensionTestsPath=${workspaceRoot}/out/test/featureTests"
4749
],
@@ -63,7 +65,9 @@
6365
"request": "launch",
6466
"runtimeExecutable": "${execPath}",
6567
"args": [
66-
"--disable-extensions",
68+
// Create a temp profile that has no extensions / user settings.
69+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
70+
"--profile-temp",
6771
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
6872
"--extensionDevelopmentPath=${workspaceRoot}",
6973
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -78,7 +82,8 @@
7882
},
7983
"sourceMaps": true,
8084
"outFiles": [
81-
"${workspaceRoot}/dist/*.js"
85+
"${workspaceRoot}/dist/*.js",
86+
"${workspaceRoot}/out/test/**/*.js"
8287
],
8388
"preLaunchTask": "buildDev"
8489
},
@@ -88,7 +93,9 @@
8893
"request": "launch",
8994
"runtimeExecutable": "${execPath}",
9095
"args": [
91-
"--disable-extensions",
96+
// Create a temp profile that has no extensions / user settings.
97+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
98+
"--profile-temp",
9299
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
93100
"--extensionDevelopmentPath=${workspaceRoot}",
94101
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -108,7 +115,9 @@
108115
"request": "launch",
109116
"runtimeExecutable": "${execPath}",
110117
"args": [
111-
"--disable-extensions",
118+
// Create a temp profile that has no extensions / user settings.
119+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
120+
"--profile-temp",
112121
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
113122
"--extensionDevelopmentPath=${workspaceRoot}",
114123
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -124,7 +133,8 @@
124133
"stopOnEntry": false,
125134
"sourceMaps": true,
126135
"outFiles": [
127-
"${workspaceRoot}/dist/*.js"
136+
"${workspaceRoot}/dist/*.js",
137+
"${workspaceRoot}/out/test/**/*.js"
128138
],
129139
"preLaunchTask": "buildDev"
130140
},
@@ -134,7 +144,9 @@
134144
"request": "launch",
135145
"runtimeExecutable": "${execPath}",
136146
"args": [
137-
"--disable-extensions",
147+
// Create a temp profile that has no extensions / user settings.
148+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
149+
"--profile-temp",
138150
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
139151
"--extensionDevelopmentPath=${workspaceRoot}",
140152
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -150,7 +162,8 @@
150162
"stopOnEntry": false,
151163
"sourceMaps": true,
152164
"outFiles": [
153-
"${workspaceRoot}/dist/*.js"
165+
"${workspaceRoot}/dist/*.js",
166+
"${workspaceRoot}/out/test/**/*.js"
154167
],
155168
"preLaunchTask": "buildDev"
156169
},
@@ -160,7 +173,9 @@
160173
"request": "launch",
161174
"runtimeExecutable": "${execPath}",
162175
"args": [
163-
"--disable-extensions",
176+
// Create a temp profile that has no extensions / user settings.
177+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
178+
"--profile-temp",
164179
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
165180
"--extensionDevelopmentPath=${workspaceRoot}",
166181
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -180,7 +195,9 @@
180195
"request": "launch",
181196
"runtimeExecutable": "${execPath}",
182197
"args": [
183-
"--disable-extensions",
198+
// Create a temp profile that has no extensions / user settings.
199+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
200+
"--profile-temp",
184201
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
185202
"--extensionDevelopmentPath=${workspaceRoot}",
186203
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -195,7 +212,8 @@
195212
},
196213
"sourceMaps": true,
197214
"outFiles": [
198-
"${workspaceRoot}/dist/*.js"
215+
"${workspaceRoot}/dist/*.js",
216+
"${workspaceRoot}/out/test/**/*.js"
199217
],
200218
"preLaunchTask": "buildDev"
201219
},
@@ -205,7 +223,9 @@
205223
"request": "launch",
206224
"runtimeExecutable": "${execPath}",
207225
"args": [
208-
"--disable-extensions",
226+
// Create a temp profile that has no extensions / user settings.
227+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
228+
"--profile-temp",
209229
"${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
210230
"--extensionDevelopmentPath=${workspaceRoot}",
211231
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -219,7 +239,8 @@
219239
},
220240
"sourceMaps": true,
221241
"outFiles": [
222-
"${workspaceRoot}/dist/*.js"
242+
"${workspaceRoot}/dist/*.js",
243+
"${workspaceRoot}/out/test/**/*.js"
223244
],
224245
"preLaunchTask": "buildDev"
225246
},
@@ -229,7 +250,9 @@
229250
"request": "launch",
230251
"runtimeExecutable": "${execPath}",
231252
"args": [
232-
"--disable-extensions",
253+
// Create a temp profile that has no extensions / user settings.
254+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
255+
"--profile-temp",
233256
"${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
234257
"--extensionDevelopmentPath=${workspaceRoot}",
235258
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
@@ -243,7 +266,8 @@
243266
},
244267
"sourceMaps": true,
245268
"outFiles": [
246-
"${workspaceRoot}/dist/*.js"
269+
"${workspaceRoot}/dist/*.js",
270+
"${workspaceRoot}/out/test/**/*.js"
247271
],
248272
"preLaunchTask": "buildDev"
249273
},

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"vsix/": true
1313
},
1414
"csharp.suppressDotnetRestoreNotification": true,
15-
"tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
1615
"typescript.tsdk": "./node_modules/typescript/lib",
1716
"mocha.enabled": true,
1817
"omnisharp.autoStart": false,
19-
"editor.formatOnSave": false
18+
"editor.formatOnSave": false,
19+
"eslint.lintTask.enable": true
2020
}

.vscode/tasks.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,5 @@
4444
"Run tests in VS Code by launching the debugger with the 'Launch Tests' configuration."
4545
]
4646
},
47-
{
48-
"label": "tslint",
49-
"command": "gulp",
50-
"type": "shell",
51-
"args": [
52-
"tslint"
53-
],
54-
"problemMatcher": {
55-
"owner": "tslint",
56-
"fileLocation": [
57-
"relative",
58-
"${workspaceFolder}"
59-
],
60-
"severity": "warning",
61-
"pattern": {
62-
"regexp": "^\\[tslint\\] (.*):(\\d+):(\\d+):\\s+(.*)$",
63-
"file": 1,
64-
"line": 2,
65-
"column": 3,
66-
"message": 4
67-
}
68-
}
69-
}
7047
]
7148
}

.vscodeignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ ISSUE_TEMPLATE
3535
package-lock.json
3636
package.json
3737
tsconfig.json
38-
tslint.json
3938
version.json
4039
wallaby.js
4140
webpack.config.js

gulpfile.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as gulp from 'gulp';
7-
import * as optionsSchemaGenerator from './src/tools/GenerateOptionsSchema';
8-
import * as packageDependencyUpdater from './src/tools/UpdatePackageDependencies';
7+
import * as optionsSchemaGenerator from './src/tools/generateOptionsSchema';
8+
import * as packageDependencyUpdater from './src/tools/updatePackageDependencies';
99

1010
require('./tasks/testTasks');
1111
require('./tasks/offlinePackagingTasks');
1212
require('./tasks/backcompatTasks');
1313

1414
// Disable warning about wanting an async function
1515
// tslint:disable-next-line
16-
gulp.task('generateOptionsSchema', (): Promise<void> => {
16+
gulp.task('generateOptionsSchema', async (): Promise<void> => {
1717
optionsSchemaGenerator.GenerateOptionsSchema();
1818
return Promise.resolve();
1919
});
2020

2121
// Disable warning about wanting an async function
2222
// tslint:disable-next-line
23-
gulp.task('updatePackageDependencies', (): Promise<void> => {
23+
gulp.task('updatePackageDependencies', async (): Promise<void> => {
2424
return packageDependencyUpdater.updatePackageDependencies();
2525
});

0 commit comments

Comments
 (0)