Skip to content

Commit

Permalink
Merge branch 'main' into local_test_run_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
plemarquand authored Dec 2, 2024
2 parents 32097e7 + 93cce88 commit 7616685
Show file tree
Hide file tree
Showing 15 changed files with 352 additions and 232 deletions.
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
!*.json
!*.ts

# Directories ignored by default that actually should be formatted
!.vscode/

# NodeJS
node_modules/

Expand Down
9 changes: 3 additions & 6 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
]
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
}
84 changes: 37 additions & 47 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,41 @@
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"env": {
"VSCODE_DEBUG": "1"
},
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "build"
},
{
"name": "Extension Tests",
"type": "extensionHost",
"request": "launch",
"testConfiguration": "${workspaceFolder}/.vscode-test.js",
"testConfigurationLabel": "integrationTests",
"args": [
"--profile=testing-debug"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"env": {
"VSCODE_DEBUG": "1",
"VSCODE_TEST": "1"
},
"preLaunchTask": "compile-tests"
},
{
"name": "Unit Tests",
"type": "extensionHost",
"request": "launch",
"testConfiguration": "${workspaceFolder}/.vscode-test.js",
"testConfigurationLabel": "unitTests",
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "compile-tests"
}
]
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"env": {
"VSCODE_DEBUG": "1"
},
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "build"
},
{
"name": "Extension Tests",
"type": "extensionHost",
"request": "launch",
"testConfiguration": "${workspaceFolder}/.vscode-test.js",
"testConfigurationLabel": "integrationTests",
"args": ["--profile=testing-debug"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"env": {
"VSCODE_DEBUG": "1",
"VSCODE_TEST": "1"
},
"preLaunchTask": "compile-tests"
},
{
"name": "Unit Tests",
"type": "extensionHost",
"request": "launch",
"testConfiguration": "${workspaceFolder}/.vscode-test.js",
"testConfigurationLabel": "unitTests",
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "compile-tests"
}
]
}
22 changes: 11 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.exclude": {
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
},
"search.exclude": {
"dist": true // set this to false to include "dist" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"files.exclude": {
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
},
"search.exclude": {
"dist": true // set this to false to include "dist" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",

// Configure Prettier
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
// Configure Prettier
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
52 changes: 26 additions & 26 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"presentation": {
"reveal": "never"
},
"isBackground": true,
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "compile-tests",
"type": "npm",
"script": "compile-tests",
"problemMatcher": "$tsc",
"presentation": {
"reveal": "never"
}
}
]
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"presentation": {
"reveal": "never"
},
"isBackground": true,
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "compile-tests",
"type": "npm",
"script": "compile-tests",
"problemMatcher": "$tsc",
"presentation": {
"reveal": "never"
}
}
]
}
1 change: 0 additions & 1 deletion assets/test/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
],
"lldb.verboseLogging": true,
"swift.backgroundCompilation": false

}
5 changes: 5 additions & 0 deletions assets/test/diagnostics/Sources/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ repeat {
line = readLine()
print(line ?? "nil")
} while line != nil;

#if canImport(Testing)
import Testing
#expect(try myFunc() != 0)
#endif
Loading

0 comments on commit 7616685

Please sign in to comment.