fix #440

Author: DonJayamanne

pythonFiles/refactor.py

@@ -264,16 +264,10 @@ def watch(self):
  while True:
  try:
  self._process_request(self._input.readline())
- except Exception as ex:
- message = ""
- try:
- message = ex.message
- except:
- pass
-
- message = message + ' \n' + traceback.format_exc()
- jsonMessage = {'error': True, 'message': message,
- 'traceback': traceback.format_exc()}
+ except:
+ exc_type, exc_value, exc_tb = sys.exc_info()
+ tb_info = traceback.extract_tb(exc_tb)
+ jsonMessage = {'error': True, 'message': str(exc_value), 'traceback': str(tb_info), 'type': str(exc_type)}
  sys.stderr.write(json.dumps(jsonMessage))
  sys.stderr.flush()
 

src/client/extension.ts

@@ -61,7 +61,7 @@ export function activate(context: vscode.ExtensionContext) {
  ]
  });
 
- context.subscriptions.push(vscode.languages.registerRenameProvider(PYTHON, new PythonRenameProvider()));
+ context.subscriptions.push(vscode.languages.registerRenameProvider(PYTHON, new PythonRenameProvider(formatOutChannel)));
  context.subscriptions.push(vscode.languages.registerHoverProvider(PYTHON, new PythonHoverProvider(context)));
  const definitionProvider = new PythonDefinitionProvider(context);
  const jediProx = definitionProvider.JediProxy;

src/client/providers/renameProvider.ts

@@ -1,11 +1,10 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import * as telemetryContracts from "../common/telemetryContracts";
-import {RefactorProxy} from '../refactor/proxy';
-import {getWorkspaceEditsFromPatch, getTextEdits} from '../common/editor';
+import { RefactorProxy } from '../refactor/proxy';
+import { getWorkspaceEditsFromPatch } from '../common/editor';
 import * as path from 'path';
-import {PythonSettings} from '../common/configSettings';
+import { PythonSettings } from '../common/configSettings';
 
 const pythonSettings = PythonSettings.getInstance();
 const EXTENSION_DIR = path.join(__dirname, '..', '..', '..');
@@ -14,24 +13,24 @@ interface RenameResponse {
 }
 
 export class PythonRenameProvider implements vscode.RenameProvider {
+ constructor(private outputChannel: vscode.OutputChannel) {
+ }
  public provideRenameEdits(document: vscode.TextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): Thenable<vscode.WorkspaceEdit> {
  return vscode.workspace.saveAll(false).then(() => {
  return this.doRename(document, position, newName, token);
  });
  }
 
  private doRename(document: vscode.TextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): Thenable<vscode.WorkspaceEdit> {
- var filename = document.fileName;
  if (document.lineAt(position.line).text.match(/^\s*\/\//)) {
  return;
  }
  if (position.character <= 0) {
  return;
  }
 
- var source = document.getText();
  var range = document.getWordRangeAtPosition(position);
- if (range == undefined || range == null || range.isEmpty) {
+ if (!range || range.isEmpty) {
  return;
  }
  const oldName = document.getText(range);
@@ -40,12 +39,14 @@ export class PythonRenameProvider implements vscode.RenameProvider {
  }
 
  let proxy = new RefactorProxy(EXTENSION_DIR, pythonSettings, vscode.workspace.rootPath);
- return new Promise<vscode.WorkspaceEdit>(resolve => {
- proxy.rename<RenameResponse>(document, newName, document.uri.fsPath, range).then(response => {
- //return response.results[0].diff;
- const workspaceEdit = getWorkspaceEditsFromPatch(response.results.map(fileChanges => fileChanges.diff));
- resolve(workspaceEdit);
- });
+ return proxy.rename<RenameResponse>(document, newName, document.uri.fsPath, range).then(response => {
+ //return response.results[0].diff;
+ const workspaceEdit = getWorkspaceEditsFromPatch(response.results.map(fileChanges => fileChanges.diff));
+ return workspaceEdit;
+ }).catch(reason => {
+ vscode.window.showErrorMessage(reason);
+ this.outputChannel.appendLine(reason);
+ return;
  });
  }
 }

src/client/refactor/proxy.ts

@@ -2,17 +2,11 @@
 
 import * as vscode from 'vscode';
 import * as path from 'path';
-import * as fs from 'fs';
 import * as child_process from 'child_process';
-import { ExtractResult } from './contracts';
-import { execPythonFile } from '../common/utils';
 import { IPythonSettings } from '../common/configSettings';
 import { REFACTOR } from '../common/telemetryContracts';
 import { sendTelemetryEvent, Delays } from '../common/telemetry';
 
-const ROPE_PYTHON_VERSION = 'Currently code refactoring is only supported in Python 2.x';
-const ERROR_PREFIX = '$ERROR';
-
 export class RefactorProxy extends vscode.Disposable {
  private _process: child_process.ChildProcess;
  private _extensionDir: string;
@@ -46,7 +40,7 @@ export class RefactorProxy extends vscode.Disposable {
  extractMethod<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range): Promise<T> {
  // Ensure last line is an empty line
  if (!document.lineAt(document.lineCount - 1).isEmptyOrWhitespace && range.start.line === document.lineCount - 1) {
- return Promise.reject<T>('Missing blank line at the end of document (PEP8).')
+ return Promise.reject<T>('Missing blank line at the end of document (PEP8).');
  }
  let command = { "lookup": "extract_method", "file": filePath, "start": document.offsetAt(range.start).toString(), "end": document.offsetAt(range.end).toString(), "id": "1", "name": name };
  return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractMethod);
@@ -109,6 +103,7 @@ export class RefactorProxy extends vscode.Disposable {
  this._previousStdErrData = '';
  }
  catch (ex) {
+ console.error(ex);
  // Possible we've only received part of the data, hence don't clear previousData
  return;
  }