Merge branch 'main' into add-testing-perf-telemetry

Author: eleanorjboyd

.github/commands.json

@@ -153,5 +153,14 @@
 		"addLabel": "info-needed",
 		"removeLabel": "~confirmation-needed",
 		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
+    {
+		"type": "label",
+		"name": "~spam",
+		"removeLabel": "~spam",
+		"addLabel": "spam",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Thank you for your submission. This issue has been closed as it doesn't meet our community guidelines or appears to be spam.\n\n**If you believe this was closed in error:**\n- Please review our [Code of Conduct](https://opensource.microsoft.com/codeofconduct/)\n- Ensure your issue contains a clear description of the problem or feature request\n- Feel free to open a new issue with appropriate detail if this was a legitimate concern\n\n**For legitimate issues, please include:**\n- Clear description of the problem\n- Steps to reproduce (for bugs)\n- Expected vs actual behavior\n- VS Code version and environment details\n\nThank you for helping us maintain a welcoming and productive community."
 	}
 ]

.github/workflows/lock-issues.yml

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

package-lock.json

@@ -1723,7 +1723,7 @@
         "semver": "^7.5.2",
         "stack-trace": "0.0.10",
         "sudo-prompt": "^9.2.1",
-        "tmp": "^0.2.5",
+        "tmp": "^0.2.7",
         "uint64be": "^3.0.0",
         "unicode": "^14.0.0",
         "vscode-debugprotocol": "^1.28.0",

package.json

@@ -8,9 +8,9 @@ microvenv==2025.0 \
     --hash=sha256:568155ec18af01c89f270d35d123ab803b09672b480c3702d15fd69e9cc5bd1e \
     --hash=sha256:8a2568a8390a4ffb5af2f05e7642454e03b887e582d192b6316326974eab5d0f
     # via -r requirements.in
-packaging==26.1 \
-    --hash=sha256:5d9c0669c6285e491e0ced2eee587eaf67b670d94a19e94e3984a481aba6802f \
-    --hash=sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de
+packaging==26.2 \
+    --hash=sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e \
+    --hash=sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661
     # via -r requirements.in
 tomli==2.4.1 \
     --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \

requirements.txt

@@ -17,13 +17,18 @@ const MEMENTO_KEY = 'userSelectedEnvPath';
 @injectable()
 export class RecommendedEnvironmentService implements IRecommendedEnvironmentService, IExtensionActivationService {
     private api?: PythonExtension['environments'];
+    private hasRegisteredCommand = false;
     constructor(@inject(IExtensionContext) private readonly extensionContext: IExtensionContext) {}
     supportedWorkspaceTypes: { untrustedWorkspace: boolean; virtualWorkspace: boolean } = {
         untrustedWorkspace: true,
         virtualWorkspace: false,
     };
 
     async activate(_resource: Resource, _startupStopWatch?: StopWatch): Promise<void> {
+        if (this.hasRegisteredCommand) {
+            return;
+        }
+        this.hasRegisteredCommand = true;
         this.extensionContext.subscriptions.push(
             commands.registerCommand('python.getRecommendedEnvironment', async (resource: Resource) => {
                 return this.getRecommededEnvironment(resource);

src/client/interpreter/configuration/recommededEnvironmentService.ts

@@ -385,8 +385,10 @@
       "autosearchpaths" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "callArgumentNameInlayHints" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "completefunctionparens" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "diagnosticsSource" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "disableTaggedHints" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "disableworkspacesymbol" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "enableDjangoSupport" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "enableextractcodeaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "enablePytestSupport" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "extracommitchars" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -395,6 +397,7 @@
       "hasconfigfile" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "hasextrapaths" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "importformat" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "includeAliasesFromUserFiles" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "intelliCodeEnabled" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "includeusersymbolsinautoimport" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "indexing" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -404,7 +407,12 @@
       "movesymbol" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "nodeExecutable" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "openfilesonly" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "persistAllIndices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "pyrightVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "pytestparameterinlaytypehints" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "referencesCodeLens" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "regenerateStdLibIndices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+      "supportDocstringTemplate" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "typecheckingmode" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "unusablecompilerflags": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
       "useimportheuristic" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },

src/client/telemetry/pylance.ts

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+'use strict';
+
+import { expect } from 'chai';
+import { anything, reset, verify, when } from 'ts-mockito';
+import { Disposable, Uri } from 'vscode';
+import { mockedVSCodeNamespaces } from '../vscode-mock';
+import { RecommendedEnvironmentService } from '../../client/interpreter/configuration/recommededEnvironmentService';
+
+suite('RecommendedEnvironmentService - activate', () => {
+    let service: RecommendedEnvironmentService;
+    let subscriptions: Disposable[];
+
+    setup(() => {
+        subscriptions = [];
+        const extensionContext = {
+            subscriptions,
+            globalState: {
+                get: () => undefined,
+                update: () => Promise.resolve(),
+            },
+        } as any;
+
+        when(mockedVSCodeNamespaces.commands!.registerCommand(anything(), anything())).thenReturn({
+            dispose: () => {},
+        } as Disposable);
+
+        service = new RecommendedEnvironmentService(extensionContext);
+    });
+
+    teardown(() => {
+        reset(mockedVSCodeNamespaces.commands!);
+    });
+
+    test('Multiroot workspace: command is registered only once across multiple activate calls', async () => {
+        // Simulate multiroot workspace where activate is called once per workspace root
+        const workspaceRoot1 = Uri.file('/workspace/root1');
+        const workspaceRoot2 = Uri.file('/workspace/root2');
+        const workspaceRoot3 = Uri.file('/workspace/root3');
+
+        await service.activate(workspaceRoot1);
+        await service.activate(workspaceRoot2);
+        await service.activate(workspaceRoot3);
+
+        verify(mockedVSCodeNamespaces.commands!.registerCommand('python.getRecommendedEnvironment', anything())).once();
+        expect(subscriptions).to.have.lengthOf(1);
+    });
+});