Merge branch 'main' into unnecessary-koala

Author: eleanorjboyd

.eslintignore

@@ -42,7 +42,6 @@ src/test/utils/fs.ts
 
 src/test/api.functional.test.ts
 
-src/test/testing/mocks.ts
 src/test/testing/common/debugLauncher.unit.test.ts
 src/test/testing/common/services/configSettingService.unit.test.ts
 
@@ -85,9 +84,7 @@ src/test/common/application/commands/reloadCommand.unit.test.ts
 
 src/test/common/installer/channelManager.unit.test.ts
 src/test/common/installer/pipInstaller.unit.test.ts
-src/test/common/installer/installer.invalidPath.unit.test.ts
 src/test/common/installer/pipEnvInstaller.unit.test.ts
-src/test/common/installer/productPath.unit.test.ts
 
 src/test/common/socketCallbackHandler.test.ts
 
@@ -103,27 +100,22 @@ src/test/common/process/proc.unit.test.ts
 src/test/common/interpreterPathService.unit.test.ts
 
 
-src/test/python_files/formatting/dummy.ts
 
 src/test/debugger/extension/adapter/adapter.test.ts
 src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
 src/test/debugger/extension/adapter/factory.unit.test.ts
-src/test/debugger/extension/adapter/activator.unit.test.ts
 src/test/debugger/extension/adapter/logging.unit.test.ts
 src/test/debugger/extension/hooks/childProcessAttachHandler.unit.test.ts
 src/test/debugger/extension/hooks/childProcessAttachService.unit.test.ts
 src/test/debugger/utils.ts
-src/test/debugger/common/protocolparser.test.ts
 src/test/debugger/envVars.test.ts
 
 src/test/telemetry/index.unit.test.ts
 src/test/telemetry/envFileTelemetry.unit.test.ts
 
 src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts
 src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts
-src/test/application/diagnostics/checks/invalidLaunchJsonDebugger.unit.test.ts
 src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts
-src/test/application/diagnostics/checks/invalidPythonPathInDebugger.unit.test.ts
 src/test/application/diagnostics/checks/envPathVariable.unit.test.ts
 src/test/application/diagnostics/applicationDiagnostics.unit.test.ts
 src/test/application/diagnostics/promptHandler.unit.test.ts
@@ -154,25 +146,18 @@ src/client/activation/extensionSurvey.ts
 src/client/activation/common/analysisOptions.ts
 src/client/activation/languageClientMiddleware.ts
 
-src/client/formatters/serviceRegistry.ts
-src/client/formatters/helper.ts
-src/client/formatters/dummyFormatter.ts
-src/client/formatters/baseFormatter.ts
 
 src/client/testing/serviceRegistry.ts
 src/client/testing/main.ts
 src/client/testing/configurationFactory.ts
 src/client/testing/common/constants.ts
 src/client/testing/common/testUtils.ts
-src/client/testing/common/socketServer.ts
-src/client/testing/common/runner.ts
 
 src/client/common/helpers.ts
 src/client/common/net/browser.ts
 src/client/common/net/socket/socketCallbackHandler.ts
 src/client/common/net/socket/socketServer.ts
 src/client/common/net/socket/SocketStream.ts
-src/client/common/editor.ts
 src/client/common/contextKey.ts
 src/client/common/experiments/telemetry.ts
 src/client/common/platform/serviceRegistry.ts
@@ -257,7 +242,6 @@ src/client/debugger/extension/attachQuickPick/psProcessParser.ts
 src/client/debugger/extension/attachQuickPick/picker.ts
 
 src/client/application/serviceRegistry.ts
-src/client/application/diagnostics/surceMapSupportService.ts
 src/client/application/diagnostics/base.ts
 src/client/application/diagnostics/applicationDiagnostics.ts
 src/client/application/diagnostics/filter.ts
@@ -267,3 +251,4 @@ src/client/application/diagnostics/commands/ignore.ts
 src/client/application/diagnostics/commands/factory.ts
 src/client/application/diagnostics/commands/execVSCCommand.ts
 src/client/application/diagnostics/commands/launchBrowser.ts
+

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

@@ -87,7 +87,7 @@ runs:
       shell: bash
 
     - name: Upload VSIX
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.artifact_name }}
         path: ${{ inputs.vsix_name }}

.github/actions/smoke-tests/action.yml

@@ -43,7 +43,7 @@ runs:
 
     # Bits from the VSIX are reused by smokeTest.ts to speed things up.
     - name: Download VSIX
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.artifact_name }}
 

.github/workflows/issues-summary.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/pr-file-check.yml

@@ -42,7 +42,7 @@ jobs:
           failure-message: 'TypeScript code was edited without also editing a ${file-pattern} file; see the Testing page in our wiki on testing guidelines (the ${skip-label} label can be used to pass this check)'
 
       - name: 'Ensure PR has an associated issue'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const labels = context.payload.pull_request.labels.map(label => label.name);

.github/workflows/stale-prs.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Warn about stale PRs
-        uses: actions/github-script@v4
+        uses: actions/github-script@v7
         with:
           script: |
             const { Octokit } = require("@octokit/rest");

python_files/vscode_pytest/__init__.py

@@ -442,7 +442,11 @@ def pytest_sessionfinish(session, exitstatus):
     if is_coverage_run == "True":
         # load the report and build the json result to return
         import coverage
-        from coverage import exceptions
+
+        try:
+            from coverage.exceptions import NoSource
+        except ImportError:
+            from coverage.misc import NoSource
 
         cov = coverage.Coverage()
         cov.load()
@@ -462,7 +466,7 @@ def pytest_sessionfinish(session, exitstatus):
         for file in file_set:
             try:
                 analysis = cov.analysis2(file)
-            except exceptions.NoSource:
+            except NoSource:
                 # as per issue 24308 this best way to handle this edge case
                 continue
             lines_executable = {int(line_no) for line_no in analysis[1]}

scripts/cleanup-eslintignore.js

@@ -0,0 +1,44 @@
+const fs = require('fs');
+const path = require('path');
+
+const baseDir = process.cwd();
+const eslintignorePath = path.join(baseDir, '.eslintignore');
+
+fs.readFile(eslintignorePath, 'utf8', (err, data) => {
+    if (err) {
+        console.error('Error reading .eslintignore file:', err);
+        return;
+    }
+
+    const lines = data.split('\n');
+    const files = lines.map((line) => line.trim()).filter((line) => line && !line.startsWith('#'));
+    const nonExistentFiles = [];
+
+    files.forEach((file) => {
+        const filePath = path.join(baseDir, file);
+        if (!fs.existsSync(filePath) && file !== 'pythonExtensionApi/out/') {
+            nonExistentFiles.push(file);
+        }
+    });
+
+    if (nonExistentFiles.length > 0) {
+        console.log('The following files listed in .eslintignore do not exist:');
+        nonExistentFiles.forEach((file) => console.log(file));
+
+        const updatedLines = lines.filter((line) => {
+            const trimmedLine = line.trim();
+            return !nonExistentFiles.includes(trimmedLine) || trimmedLine === 'pythonExtensionApi/out/';
+        });
+        const updatedData = `${updatedLines.join('\n')}\n`;
+
+        fs.writeFile(eslintignorePath, updatedData, 'utf8', (err) => {
+            if (err) {
+                console.error('Error writing to .eslintignore file:', err);
+                return;
+            }
+            console.log('Non-existent files have been removed from .eslintignore.');
+        });
+    } else {
+        console.log('All files listed in .eslintignore exist.');
+    }
+});