Skip to content

Commit 612a452

Browse files
nedsebnedseb
committed
chore: 🔧 Update workspace configuration to use explorer file nesting
1 parent 2d7dd0a commit 612a452

2 files changed

Lines changed: 61 additions & 40 deletions

File tree

.eslintrc.js renamed to .eslintrc.js

File renamed without changes.

‎makecode-steami.code-workspace‎

Lines changed: 61 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
22
"folders": [
33
{
4-
"path": "."
4+
"path": ".",
55
},
66

77
{
88
"name": "pxt",
9-
"path": "pxt/"
9+
"path": "pxt/",
1010
},
1111
{
1212
"name": "pxt-common-packages",
13-
"path": "pxt-common-packages/"
13+
"path": "pxt-common-packages/",
1414
},
1515
{
1616
"name": "pxt-steami",
17-
"path": "pxt-steami/"
17+
"path": "pxt-steami/",
1818
},
1919
{
2020
"name": "pxt-steami-backend",
21-
"path": "pxt-steami-backend/"
22-
}
21+
"path": "pxt-steami-backend/",
22+
},
2323
],
2424

2525
"settings": {
2626
"C_Cpp.default.browse.path": [
2727
"${workspaceFolder}/**",
28-
"/arm_toolchain/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/arm-none-eabi/include/**"
28+
"/arm_toolchain/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/arm-none-eabi/include/**",
2929
],
3030

3131
"cmake.generator": "Unix Makefiles",
@@ -67,8 +67,29 @@
6767
"${workspaceFolder:codal-stm32}/system/Middlewares/ST/STM32_USB_Device_Library/Class/WebUSB/Src/*",
6868
"${workspaceFolder:codal-stm32-STEAM32_WB55RG}/inc/*",
6969
"${workspaceFolder:codal-stm32-STEAM32_WB55RG}/model/*",
70-
"${workspaceFolder:codal-stm32-STEAM32_WB55RG}/samples/*"
70+
"${workspaceFolder:codal-stm32-STEAM32_WB55RG}/samples/*",
7171
],
72+
"explorer.fileNesting.enabled": true,
73+
"explorer.fileNesting.expand": false,
74+
"explorer.fileNesting.patterns": {
75+
"*.ts": "${capture}.js",
76+
"*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
77+
"*.jsx": "${capture}.js",
78+
"*.tsx": "${capture}.ts",
79+
"*.cpp": "$(capture).hpp, $(capture).h, $(capture).hxx, $(capture).hh",
80+
"Makefile": "*.mk",
81+
"package.json": "package-lock.json, .gitignore, .gitattributes, *.code-workspace",
82+
"README.md": "LICENSE.md, TODO.md, CONTRIBUTING.md",
83+
".eslintrc.js": ".clang-format, .prettierrc.json, .releaserc.json, .validate-branch-namerc.js, commitlint.config.js, git-precommit-checks.config.js",
84+
},
85+
86+
"files.exclude": {
87+
"**/.git": true,
88+
"**/.DS_Store": true,
89+
"**/Thumbs.db": true,
90+
"**/node_modules": true,
91+
"**/pxt*": true,
92+
},
7293

7394
"files.associations": {
7495
"digital_io.h": "c",
@@ -85,8 +106,8 @@
85106
"usbd_conf.h": "c",
86107
"stm32_def.h": "c",
87108
"core_cm4.h": "c",
88-
"variant.h": "c"
89-
}
109+
"variant.h": "c",
110+
},
90111
},
91112
"extensions": {
92113
"recommendations": [
@@ -105,8 +126,8 @@
105126
"trond-snekvik.gnu-mapfiles",
106127
"vivaxy.vscode-conventional-commits",
107128
"xaver.clang-format",
108-
"ZixuanWang.linkerscript"
109-
]
129+
"ZixuanWang.linkerscript",
130+
],
110131
},
111132
"tasks": {
112133
"version": "2.0.0",
@@ -116,54 +137,54 @@
116137
"script": "build",
117138
"group": {
118139
"kind": "build",
119-
"isDefault": true
140+
"isDefault": true,
120141
},
121142
"problemMatcher": [],
122-
"label": "build pxt-steami target"
143+
"label": "build pxt-steami target",
123144
},
124145
{
125146
"type": "npm",
126147
"script": "clean",
127148
"group": "build",
128149
"problemMatcher": [],
129-
"label": "clean pxt-steami target"
150+
"label": "clean pxt-steami target",
130151
},
131152
{
132153
"type": "npm",
133154
"script": "package",
134155
"group": "build",
135156
"problemMatcher": [],
136-
"label": "build static package of pxt-steami"
157+
"label": "build static package of pxt-steami",
137158
},
138159
{
139160
"type": "npm",
140161
"script": "staticserve",
141162
"group": "test",
142163
"problemMatcher": [],
143-
"label": "serve static pxt-steami editor"
164+
"label": "serve static pxt-steami editor",
144165
},
145166
{
146167
"type": "npm",
147168
"script": "serve",
148169
"group": "test",
149170
"problemMatcher": [],
150-
"label": "serve pxt-steami editor"
171+
"label": "serve pxt-steami editor",
151172
},
152173
{
153174
"label": "flash_openocd",
154175
"args": [],
155176
"type": "shell",
156177
"command": "openocd -s /usr/share/openocd/scripts/ -s ./libraries/codal-stm32-STEAM32_WB55RG/scripts -f openocd.cfg -c 'program build/STM32 verify reset exit'",
157178
"options": {
158-
"cwd": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/"
179+
"cwd": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/",
159180
},
160181
"presentation": {
161-
"reveal": "silent"
182+
"reveal": "silent",
162183
},
163184
"group": {
164185
"kind": "test",
165-
"isDefault": true
166-
}
186+
"isDefault": true,
187+
},
167188
},
168189
{
169190
"label": "flash_pyocd",
@@ -172,16 +193,16 @@
172193

173194
"command": "pyocd flash build/STM32 --format elf",
174195
"options": {
175-
"cwd": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal"
196+
"cwd": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal",
176197
},
177198
"presentation": {
178-
"reveal": "silent"
199+
"reveal": "silent",
179200
},
180201
"group": {
181-
"kind": "test"
182-
}
183-
}
184-
]
202+
"kind": "test",
203+
},
204+
},
205+
],
185206
},
186207
"launch": {
187208
"version": "0.2.0",
@@ -196,21 +217,21 @@
196217
"svdFile": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/STM32.svd",
197218
"searchDir": [
198219
"/usr/share/openocd/scripts/",
199-
"${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/"
220+
"${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/",
200221
],
201222
"configFiles": ["openocd.cfg"],
202223
"liveWatch": {
203224
"enabled": true,
204-
"samplesPerSecond": 4
225+
"samplesPerSecond": 4,
205226
},
206227
"preLaunchTask": "flash_openocd",
207228
"runToEntryPoint": "main",
208229
"showDevDebugOutput": "parsed",
209230
"preLaunchCommands": [
210231
"set mem inaccessible-by-default off",
211232
"enable breakpoint",
212-
"monitor reset"
213-
]
233+
"monitor reset",
234+
],
214235
},
215236
{
216237
"type": "cortex-debug",
@@ -222,7 +243,7 @@
222243
"svdFile": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/STM32.svd",
223244
"preLaunchTask": "flash_pyocd",
224245
"runToEntryPoint": "main",
225-
"showDevDebugOutput": "parsed"
246+
"showDevDebugOutput": "parsed",
226247
},
227248
{
228249
"type": "cortex-debug",
@@ -234,16 +255,16 @@
234255
"svdFile": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/STM32.svd",
235256
"searchDir": [
236257
"/usr/share/openocd/scripts/",
237-
"${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/"
258+
"${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/",
238259
],
239260
"configFiles": ["openocd.cfg"],
240261
"liveWatch": {
241262
"enabled": true,
242-
"samplesPerSecond": 4
263+
"samplesPerSecond": 4,
243264
},
244265
"preLaunchTask": "flash_openocd",
245266
"runToEntryPoint": "main",
246-
"showDevDebugOutput": "parsed"
267+
"showDevDebugOutput": "parsed",
247268
},
248269
{
249270
"type": "cortex-debug",
@@ -255,9 +276,9 @@
255276
"svdFile": "${workspaceFolder:pxt-steami}/libs/blocksprj/built/codal/scripts/STM32.svd",
256277
"preLaunchTask": "build current target",
257278
"runToEntryPoint": "main",
258-
"showDevDebugOutput": "parsed"
259-
}
279+
"showDevDebugOutput": "parsed",
280+
},
260281
],
261-
"compounds": []
262-
}
282+
"compounds": [],
283+
},
263284
}

0 commit comments

Comments
 (0)