Fixes #331 - Code lens shows on every import in Python

gitkraken · Apr 11, 2018 · 62a7eaf · 62a7eaf
1 parent e170e9e
commit 62a7eaf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Marks temporary files (used when showing comparisions with previous revisions) as read-only to help avoid accidental edits/saving
 
 ### Fixed
+- Fixes [#331](https://github.com/eamodio/vscode-gitlens/issues/331) - Code lens shows on every import in Python
 - Fixes issues where quick pick menu progress indicators will get stuck in some cases because of a vscode api change in [Microsoft/vscode#46102](https://github.com/Microsoft/vscode/pull/46102)
 
 ## [8.2.0] - 2018-03-31

diff --git a/package.json b/package.json
@@ -238,20 +238,26 @@
                                 "document"
                             ]
                         },
+                        {
+                            "language": "python",
+                            "symbolScopes": [
+                                "!Module"
+                            ]
+                        },
                         {
                             "language": "scss",
                             "scopes": [
                                 "document"
                             ]
                         },
                         {
-                            "language": "vue",
+                            "language": "stylus",
                             "scopes": [
                                 "document"
                             ]
                         },
                         {
-                            "language": "stylus",
+                            "language": "vue",
                             "scopes": [
                                 "document"
                             ]

diff --git a/src/gitCodeLensProvider.ts b/src/gitCodeLensProvider.ts
@@ -95,6 +95,14 @@ export class GitCodeLensProvider implements CodeLensProvider {
                 symbolScopes: cfg.symbolScopes
             } as CodeLensLanguageScope;
         }
+        else {
+            if (languageScope.scopes === undefined) {
+                languageScope.scopes = cfg.scopes;
+            }
+            if (languageScope.symbolScopes === undefined) {
+                languageScope.symbolScopes = cfg.symbolScopes;
+            }
+        }
 
         languageScope.symbolScopes = languageScope.symbolScopes != null
             ? languageScope.symbolScopes = languageScope.symbolScopes.map(s => s.toLowerCase())