Merge branch 'main' into generous-deer

Author: eleanorjboyd

.github/actions/build-vsix/action.yml

@@ -93,7 +93,7 @@ runs:
         VSIX_NAME: ${{ inputs.vsix_name }}
 
     - name: Upload VSIX
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ inputs.artifact_name }}
         path: ${{ inputs.vsix_name }}

.github/workflows/lock-issues.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Lock Issues'
-        uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
+        uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '30'

.github/workflows/pr-check.yml

@@ -680,7 +680,7 @@ jobs:
         run: npm run test:cover:report
 
       - name: Upload HTML report
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ runner.os }}-coverage-report-html
           path: ./coverage

python_files/vscode_pytest/run_pytest_script.py

@@ -55,12 +55,13 @@ def run_pytest(args):
         try:
             # Read the test ids from the file and run pytest.
             ids = ids_path.read_text(encoding="utf-8").splitlines()
-            arg_array = ["-p", "vscode_pytest", *args, *ids]
-            print("Running pytest with args: " + str(arg_array))
-            pytest.main(arg_array)
         except Exception as e:
             print("Error[vscode-pytest]: unable to read testIds from temp file" + str(e))
             run_pytest(args)
+        else:
+            arg_array = ["-p", "vscode_pytest", *args, *ids]
+            print("Running pytest with args: " + str(arg_array))
+            pytest.main(arg_array)
         finally:
             # Delete the test ids temp file.
             try:

src/client/telemetry/pylance.ts

@@ -467,6 +467,11 @@
       "failed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
    }
 */
+/* __GDPR__
+   "language_server/copilot_hover" : {
+      "symbolName" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+   }
+*/
 /**
  * Telemetry event sent when LSP server crashes
  */