fix #711

DonJayamanne · DonJayamanne · commit 45986b845f5b · 2017-02-08T20:12:34.000+11:00
diff --git a/src/client/providers/definitionProvider.ts b/src/client/providers/definitionProvider.ts
@@ -13,9 +13,10 @@ export class PythonDefinitionProvider implements vscode.DefinitionProvider {
     public constructor(context: vscode.ExtensionContext) {
         this.jediProxyHandler = new proxy.JediProxyHandler(context);
     }
-    private static parseData(data: proxy.IDefinitionResult): vscode.Definition {
-        if (data && data.definition) {
-            const definition = data.definition;
+    private static parseData(data: proxy.IDefinitionResult, possibleWord: string): vscode.Definition {
+        if (data && Array.isArray(data.definitions) && data.definitions.length > 0) {
+            const definitions = data.definitions.filter(d => d.text === possibleWord);
+            const definition = definitions.length > 0 ? definitions[0] : data.definitions[data.definitions.length - 1];
             const definitionResource = vscode.Uri.file(definition.fileName);
             const range = new vscode.Range(
                 definition.range.startLine, definition.range.startColumn,
@@ -44,8 +45,9 @@ export class PythonDefinitionProvider implements vscode.DefinitionProvider {
         if (document.isDirty) {
             cmd.source = document.getText();
         }
+        let possibleWord = document.getText(range);
         return this.jediProxyHandler.sendCommand(cmd, token).then(data => {
-            return PythonDefinitionProvider.parseData(data);
+            return PythonDefinitionProvider.parseData(data, possibleWord);
         });
     }
 }
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -307,25 +307,26 @@ function spawnProcess(dir: string) {
                         let defs = <any[]>response['results'];
                         let defResult: IDefinitionResult = {
                             requestId: cmd.id,
-                            definition: null
+                            definitions: []
                         };
                         if (defs.length > 0) {
-                            let def = defs[0];
-                            const originalType = def.type as string;
-                            defResult.definition = {
-                                fileName: def.fileName,
-                                text: def.text,
-                                rawType: originalType,
-                                type: getMappedVSCodeType(originalType),
-                                kind: getMappedVSCodeSymbol(originalType),
-                                container: def.container,
-                                range: {
-                                    startLine: def.range.start_line,
-                                    startColumn: def.range.start_column,
-                                    endLine: def.range.end_line,
-                                    endColumn: def.range.end_column
-                                }
-                            };
+                            defResult.definitions = defs.map(def => {
+                                const originalType = def.type as string;
+                                return {
+                                    fileName: def.fileName,
+                                    text: def.text,
+                                    rawType: originalType,
+                                    type: getMappedVSCodeType(originalType),
+                                    kind: getMappedVSCodeSymbol(originalType),
+                                    container: def.container,
+                                    range: {
+                                        startLine: def.range.start_line,
+                                        startColumn: def.range.start_column,
+                                        endLine: def.range.end_line,
+                                        endColumn: def.range.end_column
+                                    }
+                                };
+                            });
                         }
 
                         cmd.deferred.resolve(defResult);
@@ -587,7 +588,7 @@ export interface IHoverResult extends ICommandResult {
     items: IHoverItem[];
 }
 export interface IDefinitionResult extends ICommandResult {
-    definition: IDefinition;
+    definitions: IDefinition[];
 }
 export interface IReferenceResult extends ICommandResult {
     references: IReference[];

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@ export class PythonDefinitionProvider implements vscode.DefinitionProvider {`
`13`	`13`	`public constructor(context: vscode.ExtensionContext) {`
`14`	`14`	`this.jediProxyHandler = new proxy.JediProxyHandler(context);`
`15`	`15`	`}`
`16`		`- private static parseData(data: proxy.IDefinitionResult): vscode.Definition {`
`17`		`- if (data && data.definition) {`
`18`		`- const definition = data.definition;`
	`16`	`+ private static parseData(data: proxy.IDefinitionResult, possibleWord: string): vscode.Definition {`
	`17`	`+ if (data && Array.isArray(data.definitions) && data.definitions.length > 0) {`
	`18`	`+ const definitions = data.definitions.filter(d => d.text === possibleWord);`
	`19`	`+ const definition = definitions.length > 0 ? definitions[0] : data.definitions[data.definitions.length - 1];`
`19`	`20`	`const definitionResource = vscode.Uri.file(definition.fileName);`
`20`	`21`	`const range = new vscode.Range(`
`21`	`22`	`definition.range.startLine, definition.range.startColumn,`
`@@ -44,8 +45,9 @@ export class PythonDefinitionProvider implements vscode.DefinitionProvider {`
`44`	`45`	`if (document.isDirty) {`
`45`	`46`	`cmd.source = document.getText();`
`46`	`47`	`}`
	`48`	`+ let possibleWord = document.getText(range);`
`47`	`49`	`return this.jediProxyHandler.sendCommand(cmd, token).then(data => {`
`48`		`- return PythonDefinitionProvider.parseData(data);`
	`50`	`+ return PythonDefinitionProvider.parseData(data, possibleWord);`
`49`	`51`	`});`
`50`	`52`	`}`
`51`	`53`	`}`