Skip to content

Commit 889d4ff

Browse files
gcampbell-msftgcampbell-msft
authored
update formatting (#564)
* update formatting * add extensions.json
1 parent 8e48036 commit 889d4ff

34 files changed

+11364
-8586
lines changed

‎.vscode/extensions.json‎

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

‎.vscode/launch.json‎

Lines changed: 49 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
11
// A launch configuration that compiles the extension and then opens it inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
5-
{
6-
"name": "Launch Extension",
7-
"type": "extensionHost",
8-
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
10-
"args": [
11-
"--extensionDevelopmentPath=${workspaceFolder}",
12-
],
13-
"sourceMaps": true,
14-
"outFiles": [
15-
"${workspaceFolder}/**/*.js"
16-
],
17-
"env": {
18-
"MAKEFILE_TOOLS_TESTING": "1",
19-
"WindowsSDKVersion": "12.3.45678.9\\",
20-
"CMT_DEVRUN": "1"
21-
},
22-
"preLaunchTask": "build-with-webpack-watch",
23-
},
24-
{
25-
"name": "Launch Tests",
26-
"type": "extensionHost",
27-
"request": "launch",
28-
"runtimeExecutable": "${execPath}",
29-
"args": [
30-
"${workspaceFolder}/src/test/fakeSuite/Repros",
31-
"--disable-workspace-trust",
32-
"--disable-extensions",
33-
"--extensionDevelopmentPath=${workspaceFolder}",
34-
"--extensionTestsPath=${workspaceFolder}/out/src/test/fakeSuite/index"
35-
],
36-
"sourceMaps": true,
37-
"outFiles": [
38-
"${workspaceFolder}/out/*",
39-
"${workspaceFolder}/out/src/*",
40-
"${workspaceFolder}/out/src/test/**/*"
41-
],
42-
"env": {
43-
"MAKEFILE_TOOLS_TESTING": "1",
44-
"WindowsSDKVersion": "12.3.45678.9\\"
45-
},
46-
"preLaunchTask": "Pretest",
47-
},
48-
{
49-
"name": "Node Attach",
50-
"type": "node",
51-
"request": "attach",
52-
"port": 5858
53-
}
54-
]
55-
}
3+
"version": "0.1.0",
4+
"configurations": [
5+
{
6+
"name": "Launch Extension",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
11+
"sourceMaps": true,
12+
"outFiles": ["${workspaceFolder}/**/*.js"],
13+
"env": {
14+
"MAKEFILE_TOOLS_TESTING": "1",
15+
"WindowsSDKVersion": "12.3.45678.9\\",
16+
"CMT_DEVRUN": "1"
17+
},
18+
"preLaunchTask": "build-with-webpack-watch"
19+
},
20+
{
21+
"name": "Launch Tests",
22+
"type": "extensionHost",
23+
"request": "launch",
24+
"runtimeExecutable": "${execPath}",
25+
"args": [
26+
"${workspaceFolder}/src/test/fakeSuite/Repros",
27+
"--disable-workspace-trust",
28+
"--disable-extensions",
29+
"--extensionDevelopmentPath=${workspaceFolder}",
30+
"--extensionTestsPath=${workspaceFolder}/out/src/test/fakeSuite/index"
31+
],
32+
"sourceMaps": true,
33+
"outFiles": [
34+
"${workspaceFolder}/out/*",
35+
"${workspaceFolder}/out/src/*",
36+
"${workspaceFolder}/out/src/test/**/*"
37+
],
38+
"env": {
39+
"MAKEFILE_TOOLS_TESTING": "1",
40+
"WindowsSDKVersion": "12.3.45678.9\\"
41+
},
42+
"preLaunchTask": "Pretest"
43+
},
44+
{
45+
"name": "Node Attach",
46+
"type": "node",
47+
"request": "attach",
48+
"port": 5858
49+
}
50+
]
51+
}

‎.vscode/settings.json‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,37 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
3-
"files.exclude": {
4-
"out": false // set this to true to hide the "out" folder with the compiled JS files
5-
},
6-
"search.exclude": {
7-
"out": true // set this to false to include "out" folder in search results
8-
},
9-
"typescript.tsdk": "./node_modules/typescript/lib",
10-
"editor.detectIndentation": false,
11-
"cmake.configureOnOpen": false // we want to use the TS server from our node_modules folder to control its version
12-
}
3+
"files.exclude": {
4+
"out": false // set this to true to hide the "out" folder with the compiled JS files
5+
},
6+
"search.exclude": {
7+
"out": true // set this to false to include "out" folder in search results
8+
},
9+
"typescript.tsdk": "./node_modules/typescript/lib",
10+
"editor.detectIndentation": false,
11+
"cmake.configureOnOpen": false, // we want to use the TS server from our node_modules folder to control its version
12+
"[typescript]": {
13+
"editor.defaultFormatter": "esbenp.prettier-vscode",
14+
"editor.formatOnSave": true,
15+
"editor.tabSize": 2
16+
},
17+
"[javascript]": {
18+
"editor.defaultFormatter": "esbenp.prettier-vscode",
19+
"editor.formatOnSave": true,
20+
"editor.tabSize": 2
21+
},
22+
"[yaml]": {
23+
"editor.defaultFormatter": "esbenp.prettier-vscode",
24+
"editor.formatOnSave": true,
25+
"editor.tabSize": 2
26+
},
27+
"[json]": {
28+
"editor.defaultFormatter": "esbenp.prettier-vscode",
29+
"editor.formatOnSave": true,
30+
"editor.tabSize": 2
31+
},
32+
"[jsonc]": {
33+
"editor.defaultFormatter": "esbenp.prettier-vscode",
34+
"editor.formatOnSave": true,
35+
"editor.tabSize": 2
36+
}
37+
}

‎.vscode/tasks.json‎

Lines changed: 55 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,58 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build-with-webpack-watch",
6+
"type": "npm",
7+
"script": "compile",
8+
"problemMatcher": [
49
{
5-
"label": "build-with-webpack-watch",
6-
"type": "npm",
7-
"script": "compile",
8-
"problemMatcher": [
9-
{
10-
"owner": "typescript",
11-
"source": "ts",
12-
"applyTo": "closedDocuments",
13-
"fileLocation": "absolute",
14-
"severity": "error",
15-
"pattern": [
16-
{
17-
"regexp": "\\[tsl\\] ERROR in (.*)?\\((\\d+),(\\d+)\\)",
18-
"file": 1,
19-
"line": 2,
20-
"column": 3
21-
},
22-
{
23-
"regexp": "\\s*TS\\d+:\\s*(.*)",
24-
"message": 1
25-
}
26-
],
27-
"background": {
28-
"activeOnStart": true,
29-
"beginsPattern": {
30-
"regexp": "asset"
31-
},
32-
"endsPattern": {
33-
"regexp": "webpack (.*?) compiled (.*?) ms"
34-
}
35-
}
36-
}
37-
],
38-
"isBackground": true
39-
},
40-
{
41-
"label": "Pretest",
42-
"group": "build",
43-
"isBackground": false,
44-
"type": "shell",
45-
"command": "yarn",
46-
"args": [
47-
"run",
48-
"pretest"
49-
],
50-
"dependsOn": [
51-
"Compile"
52-
]
53-
},
54-
{
55-
"label": "Compile",
56-
"group": "build",
57-
"isBackground": false,
58-
"type": "shell",
59-
"command": "yarn",
60-
"args": [
61-
"run",
62-
"compile"
63-
]
10+
"owner": "typescript",
11+
"source": "ts",
12+
"applyTo": "closedDocuments",
13+
"fileLocation": "absolute",
14+
"severity": "error",
15+
"pattern": [
16+
{
17+
"regexp": "\\[tsl\\] ERROR in (.*)?\\((\\d+),(\\d+)\\)",
18+
"file": 1,
19+
"line": 2,
20+
"column": 3
21+
},
22+
{
23+
"regexp": "\\s*TS\\d+:\\s*(.*)",
24+
"message": 1
25+
}
26+
],
27+
"background": {
28+
"activeOnStart": true,
29+
"beginsPattern": {
30+
"regexp": "asset"
31+
},
32+
"endsPattern": {
33+
"regexp": "webpack (.*?) compiled (.*?) ms"
34+
}
35+
}
6436
}
65-
]
66-
}
37+
],
38+
"isBackground": true
39+
},
40+
{
41+
"label": "Pretest",
42+
"group": "build",
43+
"isBackground": false,
44+
"type": "shell",
45+
"command": "yarn",
46+
"args": ["run", "pretest"],
47+
"dependsOn": ["Compile"]
48+
},
49+
{
50+
"label": "Compile",
51+
"group": "build",
52+
"isBackground": false,
53+
"type": "shell",
54+
"command": "yarn",
55+
"args": ["run", "compile"]
56+
}
57+
]
58+
}

0 commit comments

Comments
 (0)