Merge remote-tracking branch 'upstream' into gyb

Author: fpseverino

.eslintrc.json

@@ -6,14 +6,22 @@
     "sourceType": "module",
     "project": true
   },
-  "plugins": ["@typescript-eslint"],
+  "plugins": ["@typescript-eslint", "mocha"],
   "rules": {
     "curly": "error",
     "eqeqeq": "warn",
     "no-throw-literal": "warn",
     // TODO "@typescript-eslint/semi" rule moved to https://eslint.style
     "semi": "error",
     "no-console": "warn",
+    "mocha/no-exclusive-tests": "error",
+    "no-restricted-syntax": [
+      "error",
+      {
+        "selector": "CallExpression[callee.object.object.callee.name='tag'][callee.property.name='only']",
+        "message": "Unexpected exclusive mocha test with tag().suite.only() or tag().test.only()"
+      }
+    ],
     "@typescript-eslint/no-floating-promises": ["warn", { "checkThenables": true }],
     "@typescript-eslint/await-thenable": "warn",
     // Mostly fails tests, ex. expect(...).to.be.true returns a Chai.Assertion

.github/dependabot.yml

@@ -22,6 +22,8 @@ updates:
       - dependency-name: "@types/svgicons2svgfont"
       - dependency-name: "octokit"
         update-types: ["version-update:semver-major"]
+      - dependency-name: "eslint-plugin-mocha"
+        update-types: ["version-update:semver-major"]
       # Newer versions of fantasticon are broken on Windows.
       # https://github.com/tancredi/fantasticon/issues/470
       - dependency-name: "fantasticon"

.github/workflows/nightly.yml

@@ -1,5 +1,8 @@
 name: Nightly
 
+permissions:
+  contents: read
+
 on:
   schedule:
     - cron: "0 0 * * *"

.github/workflows/pull_request.yml

@@ -1,5 +1,8 @@
 name: Pull request
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     types: [opened, reopened, synchronize]

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

.vscodeignore

@@ -12,6 +12,7 @@
 !assets/walkthrough/**
 !assets/documentation-webview/**
 !assets/swift-docc-render/**
+!assets/swift_askpass.sh
 !node_modules/@vscode/codicons/**
 !swift-gyb.language-configuration.json
 !syntaxes/**

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Prompt to cancel and replace the active test run if one is in flight ([#1774](https://github.com/swiftlang/vscode-swift/pull/1774))
 - A walkthrough for first time extension users ([#1560](https://github.com/swiftlang/vscode-swift/issues/1560))
 - Allow `swift.backgroundCompilation` setting to accept an object where enabling the `useDefaultTask` property will run the default build task, and the `release` property will run the `release` variant of the Build All task ([#1857](https://github.com/swiftlang/vscode-swift/pull/1857))
+- Added new `target` and `configuration` properties to `swift` launch configurations that can be used instead of `program` for SwiftPM based projects ([#1890](https://github.com/swiftlang/vscode-swift/pull/1890))
 
 ### Fixed
 

assets/swift_askpass.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+VSCODE_SWIFT_ASKPASS_FILE=$(mktemp)
+
+ELECTRON_RUN_AS_NODE="1" VSCODE_SWIFT_ASKPASS_FILE="$VSCODE_SWIFT_ASKPASS_FILE" "$VSCODE_SWIFT_ASKPASS_NODE" "$VSCODE_SWIFT_ASKPASS_MAIN"
+EXIT_CODE=$?
+
+cat "$VSCODE_SWIFT_ASKPASS_FILE"
+rm "$VSCODE_SWIFT_ASKPASS_FILE"
+
+exit "$EXIT_CODE"

assets/test/.vscode/launch.json

@@ -4,6 +4,7 @@
             "type": "swift",
             "request": "launch",
             "name": "Debug PackageExe (defaultPackage)",
+            // Explicitly use "program" to test searching for launch configs by program.
             "program": "${workspaceFolder:test}/defaultPackage/.build/debug/PackageExe",
             "args": [],
             "cwd": "${workspaceFolder:test}/defaultPackage",
@@ -15,7 +16,9 @@
             "type": "swift",
             "request": "launch",
             "name": "Release PackageExe (defaultPackage)",
-            "program": "${workspaceFolder:test}/defaultPackage/.build/release/PackageExe",
+            // Explicitly use "target" and "configuration" to test searching for launch configs by target.
+            "target": "PackageExe",
+            "configuration": "release",
             "args": [],
             "cwd": "${workspaceFolder:test}/defaultPackage",
             "preLaunchTask": "swift: Build Release PackageExe (defaultPackage)",

assets/test/.vscode/settings.json

@@ -7,6 +7,7 @@
         "-Xswiftc",
         "-DTEST_ARGUMENT_SET_VIA_TEST_BUILD_ARGUMENTS_SETTING"
     ],
+    "swift.outputChannelLogLevel": "debug",
     "lldb.verboseLogging": true,
     "lldb.launch.terminal": "external",
     "lldb-dap.detachOnError": true,