fix: highlighting in Python syntax closes #34

meetio-theme · Apr 1, 2020 · b521011 · b521011
1 parent 20e3b1e
commit b521011
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sublime-meetio-theme",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "The most powerful and adaptive theme for Sublime Text 3",
     "bugs": {
         "url": "https://github.com/meetio-theme/sublime-meetio-theme/issues"
@@ -37,7 +37,7 @@
         "@commitlint/config-conventional": "^8.3.4",
         "@meetio/meetio-colors": "^1.6.0",
         "@meetio/meetio-icons": "^1.10.0",
-        "@meetio/scheme-generator": "^1.4.2",
+        "@meetio/scheme-generator": "^1.4.6",
         "@typescript-eslint/eslint-plugin": "2.15.0",
         "@typescript-eslint/parser": "2.15.0",
         "babel-eslint": "^10.0.3",

diff --git a/schemes/Meetio-Theme-Dark.sublime-color-scheme b/schemes/Meetio-Theme-Dark.sublime-color-scheme
@@ -377,19 +377,24 @@
         },
         {
             "name": "PUNCTUATION - Parameters eg: ()",
-            "scope": "punctuation.definition.parameters.begin,punctuation.definition.block,punctuation.definition.parameters.end",
+            "scope": "punctuation.section.inheritance.begin,punctuation.section.inheritance.end,punctuation.section.arguments.begin,punctuation.section.arguments.end,punctuation.definition.parameters.begin,punctuation.definition.parameters.end,punctuation.definition.block,punctuation.definition.metadata.begin,punctuation.definition.metadata.end",
             "foreground": "var(cyan)"
         },
         {
             "name": "PUNCTUATION - Embedded eg: {}",
-            "scope": "punctuation.section.embedded.begin,punctuation.section.embedded.end",
+            "scope": "punctuation.section.embedded.begin,punctuation.section.embedded.end,meta.interpolation punctuation.section.interpolation.begin,meta.interpolation punctuation.section.interpolation.end",
             "foreground": "var(cyan)"
         },
         {
             "name": "PUNCTUATION - Parameters eg: <>",
             "scope": "punctuation.definition.tag.begin,punctuation.definition.tag.end",
             "foreground": "var(cyan)"
         },
+        {
+            "name": "PUNCTUATION - Parameters eg: []",
+            "scope": "punctuation.section.sequence.begin,punctuation.section.sequence.end,punctuation.definition.link.begin,punctuation.definition.link.end,punctuation.definition.image.begin,punctuation.definition.image.end",
+            "foreground": "var(cyan)"
+        },
         {
             "name": "PUNCTUATION - Line-continuation characters, such as in Python and R",
             "scope": "punctuation.separator.continuation",
@@ -653,7 +658,7 @@
         },
         {
             "name": "PYTHON - Function",
-            "scope": "source.python meta.function.python",
+            "scope": "source.python meta.function.python,source.python meta.qualified-name.python support.type.python",
             "foreground": "var(blue)"
         },
         {

diff --git a/schemes/Meetio-Theme-Light.sublime-color-scheme b/schemes/Meetio-Theme-Light.sublime-color-scheme
@@ -377,19 +377,24 @@
         },
         {
             "name": "PUNCTUATION - Parameters eg: ()",
-            "scope": "punctuation.definition.parameters.begin,punctuation.definition.block,punctuation.definition.parameters.end",
+            "scope": "punctuation.section.inheritance.begin,punctuation.section.inheritance.end,punctuation.section.arguments.begin,punctuation.section.arguments.end,punctuation.definition.parameters.begin,punctuation.definition.parameters.end,punctuation.definition.block,punctuation.definition.metadata.begin,punctuation.definition.metadata.end",
             "foreground": "var(cyan)"
         },
         {
             "name": "PUNCTUATION - Embedded eg: {}",
-            "scope": "punctuation.section.embedded.begin,punctuation.section.embedded.end",
+            "scope": "punctuation.section.embedded.begin,punctuation.section.embedded.end,meta.interpolation punctuation.section.interpolation.begin,meta.interpolation punctuation.section.interpolation.end",
             "foreground": "var(cyan)"
         },
         {
             "name": "PUNCTUATION - Parameters eg: <>",
             "scope": "punctuation.definition.tag.begin,punctuation.definition.tag.end",
             "foreground": "var(cyan)"
         },
+        {
+            "name": "PUNCTUATION - Parameters eg: []",
+            "scope": "punctuation.section.sequence.begin,punctuation.section.sequence.end,punctuation.definition.link.begin,punctuation.definition.link.end,punctuation.definition.image.begin,punctuation.definition.image.end",
+            "foreground": "var(cyan)"
+        },
         {
             "name": "PUNCTUATION - Line-continuation characters, such as in Python and R",
             "scope": "punctuation.separator.continuation",
@@ -653,7 +658,7 @@
         },
         {
             "name": "PYTHON - Function",
-            "scope": "source.python meta.function.python",
+            "scope": "source.python meta.function.python,source.python meta.qualified-name.python support.type.python",
             "foreground": "var(blue)"
         },
         {

diff --git a/scripts/schemes/index.ts b/scripts/schemes/index.ts
@@ -3,9 +3,10 @@ import {
     generateScheme,
     ISchemeSetting,
     IRules,
+    IColors
 } from '@meetio/scheme-generator';
 
-import { light, dark, IColors } from '@meetio/meetio-colors';
+import { light, dark } from '@meetio/meetio-colors';
 
 interface IScheme {
     name: string;