Merge pull request #29 from doki-theme/newSyntaxColoring

Consistent Syntax Coloring
doki-theme · Oct 26, 2020 · 42f98ee · 42f98ee
2 parents 33bb952 + e883ee9
commit 42f98ee
Show file tree

Hide file tree

Showing 69 changed files with 357 additions and 861 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+# 7.0.0 [Platform Consistency]
+
+- Migrated all theme's syntax coloring to look like the Jetbrains themes
+  - [Please see the pull request for more information](https://github.com/doki-theme/doki-theme-vscode/pull/29)
+- Updated Ram's status bar usability
+
 # 6.0.0 [Fate, Gate, Konosuba]
 
 ## 5 New Themes!

diff --git a/buildSrc/BuildThemes.ts b/buildSrc/BuildThemes.ts
@@ -616,14 +616,23 @@ walkDir(masterThemeTemplateDirectoryPath)
       } Stickers`,
     }));
 
+    const ishtarId = '62a4f26f-34b2-46f8-a10c-798e48c1ce9d';
     const themes = dokiDefinitions.map((dokiDefinition) => ({
       id: dokiDefinition.id,
       label: `Doki Theme: ${getThemeGroup(dokiDefinition)} ${
         dokiDefinition.displayName
       }`,
       path: `./${themeOutputDirectory}/${dokiDefinition.name}${themePostfix}`,
       uiTheme: dokiDefinition.dark ? "vs-dark" : "vs",
-    }));
+    })).sort((a, b) => {
+      if(a.id === ishtarId) {
+        return -1;
+      } else if (b.id === ishtarId) {
+        return 1;
+      } else {
+        return a.label.localeCompare(b.label);
+      }
+    });
 
     packageJson.activationEvents = [
       ...packageJson.activationEvents.filter(

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "The Doki Theme",
   "description": "A bunch of themes with cute anime girls. Code with your waifu!",
   "publisher": "unthrottled",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "license": "MIT",
   "icon": "Doki-Theme.png",
   "galleryBanner": {
@@ -251,6 +251,66 @@
       }
     ],
     "themes": [
+      {
+        "id": "62a4f26f-34b2-46f8-a10c-798e48c1ce9d",
+        "label": "Doki Theme: Fate:  Ishtar",
+        "path": "./generatedThemes/Ishtar Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3",
+        "label": "Doki Theme: DDLC:  Monika",
+        "path": "./generatedThemes/Monika Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "9a310731-ab2d-40f5-b502-fa5419f799a2",
+        "label": "Doki Theme: DDLC:  Monika",
+        "path": "./generatedThemes/Monika Light.theme.json",
+        "uiTheme": "vs"
+      },
+      {
+        "id": "a7e0aa28-739a-4671-80ae-3980997e6b71",
+        "label": "Doki Theme: DDLC:  Natsuki",
+        "path": "./generatedThemes/Natsuki Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "91415015-8fe3-48eb-9951-70a5cd6cbb7f",
+        "label": "Doki Theme: DDLC:  Natsuki",
+        "path": "./generatedThemes/Natsuki Light.theme.json",
+        "uiTheme": "vs"
+      },
+      {
+        "id": "cb8ef4b7-0844-4a04-b08b-754086598de4",
+        "label": "Doki Theme: DDLC:  Sayori",
+        "path": "./generatedThemes/Sayori Light.theme.json",
+        "uiTheme": "vs"
+      },
+      {
+        "id": "b0340303-0a5a-4a20-9b9c-fc8ce9880078",
+        "label": "Doki Theme: DDLC:  Š̸̘͚̼͎̯̙̣̱̎̋̐͒a̴̖̟̠̳̤͙̟͂̂͑̐͜ỷ̵̧̨̞̠̖̠o̴̧͍̗̬̎̓͆̔͝ͅr̴̡̮̟͈͠ͅi̴̡̨͓͈̬̗̺̍́̃̇̓",
+        "path": "./generatedThemes/Sayori Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "a14733d6-8e15-4e75-b6b8-509f323e5b3b",
+        "label": "Doki Theme: DDLC:  Yuri",
+        "path": "./generatedThemes/Yuri Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
+      {
+        "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68",
+        "label": "Doki Theme: DDLC:  Yuri",
+        "path": "./generatedThemes/Yuri Light.theme.json",
+        "uiTheme": "vs"
+      },
+      {
+        "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116",
+        "label": "Doki Theme: DM:  Kanna",
+        "path": "./generatedThemes/Kanna.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "420b0ed5-803c-4127-97e3-dae6aa1a5972",
         "label": "Doki Theme: DR:  Ibuki",
@@ -264,9 +324,9 @@
         "uiTheme": "vs"
       },
       {
-        "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116",
-        "label": "Doki Theme: DM:  Kanna",
-        "path": "./generatedThemes/Kanna.theme.json",
+        "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
+        "label": "Doki Theme: DxD:  Rias",
+        "path": "./generatedThemes/Rias.theme.json",
         "uiTheme": "vs-dark"
       },
       {
@@ -275,12 +335,6 @@
         "path": "./generatedThemes/Misato Katsuragi.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "62a4f26f-34b2-46f8-a10c-798e48c1ce9d",
-        "label": "Doki Theme: Fate:  Ishtar",
-        "path": "./generatedThemes/Ishtar Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "325c5d4d-5614-4c58-b296-18924f2f6928",
         "label": "Doki Theme: Fate:  Ishtar",
@@ -299,12 +353,6 @@
         "path": "./generatedThemes/Rory Mercury.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
-        "label": "Doki Theme: DxD:  Rias",
-        "path": "./generatedThemes/Rias.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "19b65ec8-133c-4655-a77b-13623d8e97d3",
         "label": "Doki Theme: KillLaKill:  Ryuko",
@@ -341,54 +389,6 @@
         "path": "./generatedThemes/Megumin.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3",
-        "label": "Doki Theme: DDLC:  Monika",
-        "path": "./generatedThemes/Monika Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
-      {
-        "id": "9a310731-ab2d-40f5-b502-fa5419f799a2",
-        "label": "Doki Theme: DDLC:  Monika",
-        "path": "./generatedThemes/Monika Light.theme.json",
-        "uiTheme": "vs"
-      },
-      {
-        "id": "a7e0aa28-739a-4671-80ae-3980997e6b71",
-        "label": "Doki Theme: DDLC:  Natsuki",
-        "path": "./generatedThemes/Natsuki Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
-      {
-        "id": "91415015-8fe3-48eb-9951-70a5cd6cbb7f",
-        "label": "Doki Theme: DDLC:  Natsuki",
-        "path": "./generatedThemes/Natsuki Light.theme.json",
-        "uiTheme": "vs"
-      },
-      {
-        "id": "b0340303-0a5a-4a20-9b9c-fc8ce9880078",
-        "label": "Doki Theme: DDLC:  Š̸̘͚̼͎̯̙̣̱̎̋̐͒a̴̖̟̠̳̤͙̟͂̂͑̐͜ỷ̵̧̨̞̠̖̠o̴̧͍̗̬̎̓͆̔͝ͅr̴̡̮̟͈͠ͅi̴̡̨͓͈̬̗̺̍́̃̇̓",
-        "path": "./generatedThemes/Sayori Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
-      {
-        "id": "cb8ef4b7-0844-4a04-b08b-754086598de4",
-        "label": "Doki Theme: DDLC:  Sayori",
-        "path": "./generatedThemes/Sayori Light.theme.json",
-        "uiTheme": "vs"
-      },
-      {
-        "id": "a14733d6-8e15-4e75-b6b8-509f323e5b3b",
-        "label": "Doki Theme: DDLC:  Yuri",
-        "path": "./generatedThemes/Yuri Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
-      {
-        "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68",
-        "label": "Doki Theme: DDLC:  Yuri",
-        "path": "./generatedThemes/Yuri Light.theme.json",
-        "uiTheme": "vs"
-      },
       {
         "id": "be058474-b967-4afb-b6d9-bda1948b33ec",
         "label": "Doki Theme: LS:  Konata",
@@ -473,4 +473,4 @@
   "resolutions": {
     "minimist": "0.2.1"
   }
-}
+}
diff --git a/screenshots/danganronpa/ibuki_dark_code.png b/screenshots/danganronpa/ibuki_dark_code.png
diff --git a/screenshots/danganronpa/ibuki_light_code.png b/screenshots/danganronpa/ibuki_light_code.png
diff --git a/screenshots/dragonMaid/kanna_dark_code.png b/screenshots/dragonMaid/kanna_dark_code.png
diff --git a/screenshots/dragonMaid/kanna_dark_secondary_code.png b/screenshots/dragonMaid/kanna_dark_secondary_code.png
diff --git a/screenshots/eva/misato_dark_code.png b/screenshots/eva/misato_dark_code.png
diff --git a/screenshots/fate/ishtar_dark_code.png b/screenshots/fate/ishtar_dark_code.png
diff --git a/screenshots/fate/ishtar_light_code.png b/screenshots/fate/ishtar_light_code.png
diff --git a/screenshots/fate/rin_dark_code.png b/screenshots/fate/rin_dark_code.png
diff --git a/screenshots/gate/rory_dark_code.png b/screenshots/gate/rory_dark_code.png
diff --git a/screenshots/highSchoolDxD/rias_dark_code.png b/screenshots/highSchoolDxD/rias_dark_code.png
diff --git a/screenshots/killlakill/ryuko_code.png b/screenshots/killlakill/ryuko_code.png
diff --git a/screenshots/killlakill/satsuki_code.png b/screenshots/killlakill/satsuki_code.png
diff --git a/screenshots/konosuba/aqua_dark_code.png b/screenshots/konosuba/aqua_dark_code.png
diff --git a/screenshots/konosuba/darkness_dark_code.png b/screenshots/konosuba/darkness_dark_code.png
diff --git a/screenshots/konosuba/darkness_light_code.png b/screenshots/konosuba/darkness_light_code.png
diff --git a/screenshots/konosuba/megumin_code.png b/screenshots/konosuba/megumin_code.png
diff --git a/screenshots/literature/monika_dark_code.png b/screenshots/literature/monika_dark_code.png
diff --git a/screenshots/literature/monika_dark_secondary_code.png b/screenshots/literature/monika_dark_secondary_code.png
diff --git a/screenshots/literature/monika_light_code.png b/screenshots/literature/monika_light_code.png
diff --git a/screenshots/literature/monika_light_secondary_code.png b/screenshots/literature/monika_light_secondary_code.png
diff --git a/screenshots/literature/natsuki_dark_code.png b/screenshots/literature/natsuki_dark_code.png
diff --git a/screenshots/literature/natsuki_dark_secondary_code.png b/screenshots/literature/natsuki_dark_secondary_code.png
diff --git a/screenshots/literature/natsuki_light_code.png b/screenshots/literature/natsuki_light_code.png
diff --git a/screenshots/literature/natsuki_light_secondary_code.png b/screenshots/literature/natsuki_light_secondary_code.png
diff --git a/screenshots/literature/sayori_dark_code.png b/screenshots/literature/sayori_dark_code.png
diff --git a/screenshots/literature/sayori_dark_secondary_code.png b/screenshots/literature/sayori_dark_secondary_code.png
diff --git a/screenshots/literature/sayori_light_code.png b/screenshots/literature/sayori_light_code.png
diff --git a/screenshots/literature/sayori_light_secondary_code.png b/screenshots/literature/sayori_light_secondary_code.png
diff --git a/screenshots/literature/yuri_dark_code.png b/screenshots/literature/yuri_dark_code.png
diff --git a/screenshots/literature/yuri_dark_secondary_code.png b/screenshots/literature/yuri_dark_secondary_code.png
diff --git a/screenshots/literature/yuri_light_code.png b/screenshots/literature/yuri_light_code.png
diff --git a/screenshots/literature/yuri_light_secondary_code.png b/screenshots/literature/yuri_light_secondary_code.png
diff --git a/screenshots/miscellaneous/miku_code.png b/screenshots/miscellaneous/miku_code.png
diff --git a/screenshots/rezero/beatrice_code.png b/screenshots/rezero/beatrice_code.png
diff --git a/screenshots/rezero/emilia_dark_code.png b/screenshots/rezero/emilia_dark_code.png
diff --git a/screenshots/rezero/emilia_light_code.png b/screenshots/rezero/emilia_light_code.png
diff --git a/screenshots/rezero/ram_code.png b/screenshots/rezero/ram_code.png
diff --git a/screenshots/rezero/rem_code.png b/screenshots/rezero/rem_code.png
diff --git a/screenshots/swordArtOnline/asuna_light_code.png b/screenshots/swordArtOnline/asuna_light_code.png
diff --git a/src/WelcomeService.ts b/src/WelcomeService.ts
@@ -27,17 +27,24 @@ export function attemptToGreetUser(context: vscode.ExtensionContext) {
                 </p>
                 <h2>Themes!</h2>
                 <p>
-                    With over 10 themes (light and dark) I think you will be able to find your favorite.
-                    You can even find one that fits your mood for the day.
+                    With over 30+ themes (light and dark) I think you will be able to find 
+                    find best girl.
                 </p>
                 <p>
-                    You can choose themes from the following Doki-Doki Theme Suites:
+                    You can choose themes from the following Doki-Doki Theme Suites such as:
                 </p>
                 <ul>
                     <li>Doki-Doki Literature Club</li>
                     <li>Re:Zero</li>
                     <li>Kill La Kill</li>
                     <li>KonoSuba</li>
+                    <li>DanganRonpa</li>
+                    <li>High School DxD</li>
+                    <li>Lucky Star</li>
+                    <li>Sword Art Online</li>
+                    <li>Fate</li>
+                    <li>Gate</li>
+                    <li>Miss Kobayashi's Dragon Maid</li>
                 </ul>
                 <h2>Stickers!</h2>
                     <p>

diff --git a/themes/definitions/danganronpa/ibuki/dark/ibuki.dark.vsCode.definition.json b/themes/definitions/danganronpa/ibuki/dark/ibuki.dark.vsCode.definition.json
@@ -1,6 +1,15 @@
 {
   "id": "420b0ed5-803c-4127-97e3-dae6aa1a5972",
-  "overrides": {},
+  "overrides": {
+    "editorScheme":{
+      "colors" : {
+        "accentColor": "#ff69df",
+        "startColor": "#68c4ee",
+        "nonProjectFileScopeColor": "#343635",
+        "testScopeColor": "#2f393a"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {}

diff --git a/themes/definitions/dragonMaid/kanna/dark/kanna.dark.vsCode.definition.json b/themes/definitions/dragonMaid/kanna/dark/kanna.dark.vsCode.definition.json
@@ -1,6 +1,15 @@
 {
   "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116",
-  "overrides": {},
+  "overrides": {
+    "editorScheme":{
+      "colors" : {
+        "accentColor": "#69ecf5",
+        "startColor": "#ff69df",
+        "nonProjectFileScopeColor": "#221d29",
+        "testScopeColor": "#232c31"
+      }
+    }
+  },
   "laf": {
     "extends": "dark",
     "ui": {

diff --git a/themes/definitions/eva/misato/dark/misato.dark.vsCode.definition.json b/themes/definitions/eva/misato/dark/misato.dark.vsCode.definition.json
@@ -1,6 +1,13 @@
 {
   "id": "8e8773ee-4bbb-4812-b311-005f04f6bb20",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#42E66C",
+        "startColor": "#ff7400"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {

diff --git a/themes/definitions/fate/ishtar/dark/ishtar.dark.vsCode.definition.json b/themes/definitions/fate/ishtar/dark/ishtar.dark.vsCode.definition.json
@@ -1,6 +1,12 @@
 {
   "id": "62a4f26f-34b2-46f8-a10c-798e48c1ce9d",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "startColor": "#e0474b"
+      }
+    }
+  },
   "laf": {
     "extends": "dark",
     "ui": {

diff --git a/themes/definitions/fate/ishtar/light/ishtar.light.vsCode.definition.json b/themes/definitions/fate/ishtar/light/ishtar.light.vsCode.definition.json
@@ -1,6 +1,12 @@
 {
   "id": "325c5d4d-5614-4c58-b296-18924f2f6928",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#9c3123"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {}

diff --git a/themes/definitions/fate/rin/dark/rin.dark.vsCode.definition.json b/themes/definitions/fate/rin/dark/rin.dark.vsCode.definition.json
@@ -1,6 +1,13 @@
 {
   "id": "3546f7be-b84f-4b8e-8cad-effa3f4603af",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#68a8cb",
+        "startColor": "#68ee75"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {}

diff --git a/themes/definitions/gate/rory/dark/rory.dark.vsCode.definition.json b/themes/definitions/gate/rory/dark/rory.dark.vsCode.definition.json
@@ -1,6 +1,12 @@
 {
   "id": "355d711c-2fa6-4df2-9504-dd44d8f5e350",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "startColor": "#ee2726"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {}

diff --git a/themes/definitions/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json b/themes/definitions/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json
@@ -3,7 +3,8 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "accentColor": "#fbf96e"
+        "accentColor": "#fbf96e",
+        "startColor": "#e03392"
       }
     }
   },

diff --git a/themes/definitions/killLaKill/ryuko/ryuko.vsCode.definition.json b/themes/definitions/killLaKill/ryuko/ryuko.vsCode.definition.json
@@ -1,6 +1,13 @@
 {
   "id": "19b65ec8-133c-4655-a77b-13623d8e97d3",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "accentColor": "#e4ff10",
+        "startColor": "#e4ff10"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {}

diff --git a/themes/definitions/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json b/themes/definitions/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json
@@ -1,6 +1,12 @@
 {
   "id": "15e51483-1ccd-46b7-90cf-885cccaaaf2c",
-  "overrides": {},
+  "overrides": {
+    "editorScheme": {
+      "colors": {
+        "startColor": "#00c69a"
+      }
+    }
+  },
   "laf": {},
   "syntax": {},
   "colors": {

diff --git a/themes/definitions/konoSuba/darkness/light/darkness.light.vsCode.definition.json b/themes/definitions/konoSuba/darkness/light/darkness.light.vsCode.definition.json
@@ -3,7 +3,8 @@
   "overrides": {
     "editorScheme": {
       "colors": {
-        "accentColor": "#b6323f"
+        "accentColor": "#b6323f",
+        "startColor": "#c79c19"
       }
     }
   },