Use isort extension instead of isort. (#19997)

gulpfile.js

@@ -82,7 +82,7 @@ async function addExtensionPackDependencies() {
     // extension dependencies need not be installed during development
     const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8');
     const packageJson = JSON.parse(packageJsonContents);
-    packageJson.extensionPack = ['ms-toolsai.jupyter', 'ms-python.vscode-pylance'].concat(
+    packageJson.extensionPack = ['ms-toolsai.jupyter', 'ms-python.vscode-pylance', 'ms-python.isort'].concat(
         packageJson.extensionPack ? packageJson.extensionPack : [],
     );
     await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8');

package.json

@@ -1699,7 +1699,7 @@
                 {
                     "command": "python.sortImports",
                     "group": "Refactor",
-                    "title": "Refactor: Sort Imports",
+                    "title": "%python.command.python.sortImports.title%",
                     "when": "editorLangId == python && !notebookEditorFocused && !virtualWorkspace && shellExecutionSupported"
                 }
             ],

requirements.in

@@ -5,6 +5,3 @@
 
 # Unittest test adapter
 typing-extensions==4.4.0
-
-# Sort Imports
-isort==5.10.1

requirements.txt

@@ -4,10 +4,6 @@
 #
 #    pip-compile --generate-hashes requirements.in
 #
-isort==5.10.1 \
-    --hash=sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7 \
-    --hash=sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951
-    # via -r requirements.in
 typing-extensions==4.4.0 \
     --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \
     --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e

src/client/extensionActivation.ts

@@ -4,7 +4,6 @@
 'use strict';
 
 import {
-    CodeActionKind,
     debug,
     DebugConfigurationProvider,
     DebugConfigurationProviderTriggerKind,
@@ -38,12 +37,10 @@ import { getLanguageConfiguration } from './language/languageConfiguration';
 import { LinterCommands } from './linters/linterCommands';
 import { registerTypes as lintersRegisterTypes } from './linters/serviceRegistry';
 import { setLoggingLevel } from './logging';
-import { PythonCodeActionProvider } from './providers/codeActionProvider/pythonCodeActionProvider';
 import { PythonFormattingEditProvider } from './providers/formatProvider';
 import { ReplProvider } from './providers/replProvider';
 import { registerTypes as providersRegisterTypes } from './providers/serviceRegistry';
 import { TerminalProvider } from './providers/terminalProvider';
-import { ISortImportsEditingProvider } from './providers/types';
 import { setExtensionInstallTelemetryProperties } from './telemetry/extensionInstallTelemetry';
 import { registerTypes as tensorBoardRegisterTypes } from './tensorBoard/serviceRegistry';
 import { registerTypes as commonRegisterTerminalTypes } from './terminals/serviceRegistry';
@@ -182,9 +179,6 @@ async function activateLegacy(ext: ExtensionState): Promise<ActivationResult> {
             serviceManager.get<ITerminalAutoActivation>(ITerminalAutoActivation).register();
             const pythonSettings = configuration.getSettings();
 
-            const sortImports = serviceContainer.get<ISortImportsEditingProvider>(ISortImportsEditingProvider);
-            sortImports.registerCommands();
-
             serviceManager.get<ICodeExecutionManager>(ICodeExecutionManager).registerCommands();
 
             disposables.push(new LinterCommands(serviceManager));
@@ -205,12 +199,6 @@ async function activateLegacy(ext: ExtensionState): Promise<ActivationResult> {
             terminalProvider.initialize(window.activeTerminal).ignoreErrors();
             disposables.push(terminalProvider);
 
-            disposables.push(
-                languages.registerCodeActionsProvider(PYTHON, new PythonCodeActionProvider(), {
-                    providedCodeActionKinds: [CodeActionKind.SourceOrganizeImports],
-                }),
-            );
-
             serviceContainer
                 .getAll<DebugConfigurationProvider>(IDebugConfigurationService)
                 .forEach((debugConfigProvider) => {

src/client/providers/codeActionProvider/main.ts

@@ -4,7 +4,9 @@
 import { inject, injectable } from 'inversify';
 import * as vscodeTypes from 'vscode';
 import { IExtensionSingleActivationService } from '../../activation/types';
+import { Commands } from '../../common/constants';
 import { IDisposableRegistry } from '../../common/types';
+import { executeCommand, registerCommand } from '../../common/vscodeApis/commandApis';
 import { LaunchJsonCodeActionProvider } from './launchJsonCodeActionProvider';
 
 @injectable()
@@ -26,5 +28,8 @@ export class CodeActionProviderService implements IExtensionSingleActivationServ
                 providedCodeActionKinds: [vscode.CodeActionKind.QuickFix],
             }),
         );
+        this.disposableRegistry.push(
+            registerCommand(Commands.Sort_Imports, () => executeCommand('editor.action.organizeImports')),
+        );
     }
 }