Filter definitions by imports (#12)

Author: chrismwendt

package.json

@@ -86,9 +86,10 @@
     "typescript": "^3.1.3"
   },
   "dependencies": {
-    "@sourcegraph/basic-code-intel": "6.0.7",
+    "@sourcegraph/basic-code-intel": "6.0.12",
     "@types/ws": "^6.0.1",
     "concurrently": "^4.1.0",
+    "path-browserify": "^1.0.0",
     "rxjs": "^6.3.3",
     "tagged-template-noop": "^2.1.0",
     "vscode-jsonrpc": "^4.0.0",

src/sourcegraph-python.ts

@@ -23,6 +23,8 @@ import { getOrTryToCreateAccessToken } from './access-token'
 import { createUriConverter, UriConverter } from './converters'
 import { LanguageServerConnectionManager } from './lsp'
 
+const path = require('path-browserify')
+
 function fromSubscribable<T>(sub: {
     subscribe(next: (value?: T) => void): sourcegraph.Unsubscribable
 }): Observable<T> {
@@ -51,7 +53,6 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
         return activateBasicCodeIntel({
             languageID: 'python',
             fileExts: ['py'],
-            definitionPatterns: ['\\b%s\\b='],
             commentStyle: {
                 docPlacement: 'below the definition',
                 lineRegex: /#\s?/,
@@ -60,6 +61,49 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
                     endRegex: /"""/,
                 },
             },
+            filterDefinitions: ({ filePath, fileContent, results }) => {
+                const imports = fileContent
+                    .split('\n')
+                    .map(line => {
+                        // Matches the import at index 1
+                        const match =
+                            /^import ([\.\w]*)/.exec(line) ||
+                            /^from ([\.\w]*)/.exec(line)
+                        return match ? match[1] : undefined
+                    })
+                    .filter((x): x is string => Boolean(x))
+
+                /**
+                 * Converts a relative import to a relative path, or undefined
+                 * if the import is not relative.
+                 */
+                function relativeImportToPath(i: string): string | undefined {
+                    const match = /^(\.)(\.*)(.*)/.exec(i)
+                    if (!match) {
+                        return undefined
+                    }
+                    const parentDots = match[2]
+                    const pkg = match[3]
+                    return (
+                        parentDots.replace(/\./g, '../') +
+                        pkg.replace(/\./g, '/')
+                    )
+                }
+
+                const filteredResults = results.filter(result =>
+                    imports.some(
+                        i =>
+                            relativeImportToPath(i)
+                                ? path.join(
+                                      path.dirname(filePath),
+                                      relativeImportToPath(i)
+                                  ) === result.file.replace(/\.[^/.]+$/, '')
+                                : result.file.includes(i.replace(/\./g, '/'))
+                    )
+                )
+
+                return filteredResults.length === 0 ? results : filteredResults
+            },
         })(ctx)
     }
 

yarn.lock

@@ -739,14 +739,15 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@sourcegraph/basic-code-intel@6.0.7":
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/basic-code-intel/-/basic-code-intel-6.0.7.tgz#6ba8623c1c5e71f780a059ccea2120ffdc1e3600"
-  integrity sha512-+amGIq54N3aVOj7AxNtW6QtDfUVvtT253Ha+i9sofyo217L/7Ucwo/WoDGuded9Ng9FUxUM6UOS3MREW+lkUGQ==
+"@sourcegraph/basic-code-intel@6.0.12":
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/basic-code-intel/-/basic-code-intel-6.0.12.tgz#5d6c1a301c73a19bf28f6d25b5f4846cc3db844f"
+  integrity sha512-G8IUx29UV1asiU3SZ3AMYKlZSZxX63nC7IR4ux+Jd+TBg2OW9WrRKOEaYKp2MWlwyWBc7Dpix3hv6GqMSMJNyA==
   dependencies:
     lodash "^4.17.11"
     rxjs "^6.3.3"
     sourcegraph "^23.0.0"
+    sprintf-js "^1.1.2"
 
 "@sourcegraph/tsconfig@^3.0.0":
   version "3.0.0"
@@ -3924,6 +3925,11 @@ path-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
   integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
+path-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.0.tgz#40702a97af46ae00b0ea6fa8998c0b03c0af160d"
+  integrity sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g==
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -5223,6 +5229,11 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"