Move rename functionality to the language server (#2612)

Mikhail Arkhipov · web-flow · commit 8b2a9b035103 · 2018-09-20T22:19:29.000-07:00
* LS symbol providers * Different ready wait * Upgrade dependencies to latest LS * Make open files only default * Turn off hash checks * Fix double progress display * Update packages * Anchor dependencies * Add setting for diag throttling * Add MacOS version check * News * Correct MacOS check and lay infra for Linux checks * Linux version check * Linux check * Simplify * Test prep * Platform tests * Mac compat tests * Ubuntu tests * Revert "Ubuntu tests" This reverts commit c63c904. * Revert "Mac compat tests" This reverts commit cd970be. * Revert "Platform tests" This reverts commit 07dc2fa. * Revert "Test prep" This reverts commit 2c7243c. * Revert "Simplify" This reverts commit fef0e92. * Revert "Linux check" This reverts commit 925f663. * Revert "Linux version check" This reverts commit 0d3c066. * Revert "Correct MacOS check and lay infra for Linux checks" This reverts commit 4e12b3c. * Revert "News" This reverts commit 462ff7c. * Revert "Add MacOS version check" This reverts commit 70b13f7. * News * Format * Undo * Pass async startup option to LS * News for LS fixes * News for LS fixes * Remove issue that is not fixed * Add news * News * News * News * News * Drop typeshed submodule * Add settings to control LS output * News * Fix case * Switch to 1.26 and LSP 4.4 for outline * News * News * Add package lock * Update mock to 1.26 * Tweak news entry wording * Move rope rename off common to Jedi * Move Rename to LS * Ref fix * Update LS contrib * Merge issue * Make sure progress is cleared * Revert "Make sure progress is cleared" This reverts commit 1187d7e. * Line breaks and remove duplication * Add news
diff --git a/news/1 Enhancements/2650.md b/news/1 Enhancements/2650.md
@@ -0,0 +1 @@
+Language server now provides rename functionality.
diff --git a/src/client/activation/downloader.ts b/src/client/activation/downloader.ts
@@ -112,7 +112,7 @@ export class LanguageServerDownloader implements ILanguageServerDownloader {
                     deferred.reject(err);
                 })
                 .on('end', () => {
-                    this.output.append('complete.');
+                    this.output.appendLine('complete.');
                     deferred.resolve();
                 })
                 .pipe(fileStream);
@@ -130,8 +130,7 @@ export class LanguageServerDownloader implements ILanguageServerDownloader {
 
         const title = 'Extracting files... ';
         await window.withProgress({
-            location: ProgressLocation.Window,
-            title
+            location: ProgressLocation.Window
         }, (progress) => {
             const zip = new StreamZip({
                 file: tempFilePath,
diff --git a/src/client/activation/jedi.ts b/src/client/activation/jedi.ts
@@ -58,6 +58,8 @@ export class JediExtensionActivator implements IExtensionActivator {
             context.subscriptions.push(languages.registerSignatureHelpProvider(this.documentSelector, new PythonSignatureProvider(jediFactory), '(', ','));
         }
 
+        context.subscriptions.push(languages.registerRenameProvider(PYTHON, new PythonRenameProvider(serviceContainer)));
+
         const testManagementService = this.serviceManager.get<IUnitTestManagementService>(IUnitTestManagementService);
         testManagementService.activate()
             .then(() => testManagementService.activateCodeLenses(symbolProvider))
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -48,7 +48,6 @@ import { ILintingEngine } from './linters/types';
 import { PythonCodeActionProvider } from './providers/codeActionsProvider';
 import { PythonFormattingEditProvider } from './providers/formatProvider';
 import { LinterProvider } from './providers/linterProvider';
-import { PythonRenameProvider } from './providers/renameProvider';
 import { ReplProvider } from './providers/replProvider';
 import { registerTypes as providersRegisterTypes } from './providers/serviceRegistry';
 import { activateSimplePythonRefactorProvider } from './providers/simpleRefactorProvider';
@@ -87,9 +86,8 @@ export async function activate(context: ExtensionContext): Promise<IExtensionApi
     const configuration = serviceManager.get<IConfigurationService>(IConfigurationService);
     const pythonSettings = configuration.getSettings();
 
-    const standardOutputChannel = serviceManager.get<OutputChannel>(IOutputChannel, STANDARD_OUTPUT_CHANNEL);
-    context.subscriptions.push(languages.registerRenameProvider(PYTHON, new PythonRenameProvider(serviceManager)));
-    activateSimplePythonRefactorProvider(context, standardOutputChannel, serviceManager);
+    const standardOutputChannel = serviceContainer.get<OutputChannel>(IOutputChannel, STANDARD_OUTPUT_CHANNEL);
+    activateSimplePythonRefactorProvider(context, standardOutputChannel, serviceContainer);
 
     const activationService = serviceContainer.get<IExtensionActivationService>(IExtensionActivationService);
     await activationService.activate();
diff --git a/src/client/providers/renameProvider.ts b/src/client/providers/renameProvider.ts
@@ -1,6 +1,9 @@
 import * as path from 'path';
-import * as vscode from 'vscode';
-import { OutputChannel, ProviderResult } from 'vscode';
+import {
+    CancellationToken, OutputChannel,
+    Position, ProviderResult, RenameProvider,
+    TextDocument, window, workspace, WorkspaceEdit
+} from 'vscode';
 import { PythonSettings } from '../common/configSettings';
 import { STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import { getWorkspaceEditsFromPatch } from '../common/editor';
@@ -15,19 +18,19 @@ type RenameResponse = {
     results: [{ diff: string }];
 };
 
-export class PythonRenameProvider implements vscode.RenameProvider {
+export class PythonRenameProvider implements RenameProvider {
     private readonly outputChannel: OutputChannel;
     constructor(private serviceContainer: IServiceContainer) {
         this.outputChannel = serviceContainer.get<OutputChannel>(IOutputChannel, STANDARD_OUTPUT_CHANNEL);
     }
     @captureTelemetry(REFACTOR_RENAME)
-    public provideRenameEdits(document: vscode.TextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): ProviderResult<vscode.WorkspaceEdit> {
-        return vscode.workspace.saveAll(false).then(() => {
+    public provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit> {
+        return workspace.saveAll(false).then(() => {
             return this.doRename(document, position, newName, token);
         });
     }
 
-    private doRename(document: vscode.TextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): ProviderResult<vscode.WorkspaceEdit> {
+    private doRename(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit> {
         if (document.lineAt(position.line).text.match(/^\s*\/\//)) {
             return;
         }
@@ -44,9 +47,9 @@ export class PythonRenameProvider implements vscode.RenameProvider {
             return;
         }
 
-        let workspaceFolder = vscode.workspace.getWorkspaceFolder(document.uri);
-        if (!workspaceFolder && Array.isArray(vscode.workspace.workspaceFolders) && vscode.workspace.workspaceFolders.length > 0) {
-            workspaceFolder = vscode.workspace.workspaceFolders[0];
+        let workspaceFolder = workspace.getWorkspaceFolder(document.uri);
+        if (!workspaceFolder && Array.isArray(workspace.workspaceFolders) && workspace.workspaceFolders.length > 0) {
+            workspaceFolder = workspace.workspaceFolders[0];
         }
         const workspaceRoot = workspaceFolder ? workspaceFolder.uri.fsPath : __dirname;
         const pythonSettings = PythonSettings.getInstance(workspaceFolder ? workspaceFolder.uri : undefined);
@@ -62,7 +65,7 @@ export class PythonRenameProvider implements vscode.RenameProvider {
                     .catch(ex => console.error('Python Extension: promptToInstall', ex));
                 return Promise.reject('');
             } else {
-                vscode.window.showErrorMessage(reason);
+                window.showErrorMessage(reason);
                 this.outputChannel.appendLine(reason);
             }
             return Promise.reject(reason);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Language server now provides rename functionality.`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ export class JediExtensionActivator implements IExtensionActivator {`
`58`	`58`	`context.subscriptions.push(languages.registerSignatureHelpProvider(this.documentSelector, new PythonSignatureProvider(jediFactory), '(', ','));`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ context.subscriptions.push(languages.registerRenameProvider(PYTHON, new PythonRenameProvider(serviceContainer)));`
	`62`	`+`
`61`	`63`	`const testManagementService = this.serviceManager.get<IUnitTestManagementService>(IUnitTestManagementService);`
`62`	`64`	`testManagementService.activate()`
`63`	`65`	`.then(() => testManagementService.activateCodeLenses(symbolProvider))`