Merge branch 'develop'

SublimeText · Oct 9, 2024 · 18b405f · 18b405f
2 parents 8410a14 + d58fc82
commit 18b405f
Show file tree

Hide file tree

Showing 26 changed files with 64 additions and 27 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,8 +14,8 @@ jobs:
       with:
         python-version-file: '.python-version'
 
-    - name: Install dependencies
-      run: python -m pip install -U -r requirements-dev.txt
+    - name: Install Black
+      run: python -m pip install -U black
 
     - name: Check formatting
       run: python -m black --check .
diff --git a/icons/icons.json b/icons/icons.json
@@ -3198,6 +3198,20 @@
 			}
 		]
 	},
+	"file_type_systemverilog": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"sv",
+					"svh",
+					"vh"
+				],
+				"name": "Plain Text (SystemVerilog)",
+				"scope": "source.systemverilog"
+			}
+		]
+	},
 	"file_type_taskfile": {
 		"aliases": [
 			{
@@ -3238,10 +3252,12 @@
 		"syntaxes": [
 			{
 				"extensions": [
-					"tailwind.css"
+					"tailwind.css",
+					"tailwind.pcss",
+					"tailwind.postcss"
 				],
 				"name": "Plain Text (Tailwind CSS)",
-				"scope": "source.css.tailwind"
+				"scope": "source.css.tailwind, source.postcss.tailwind"
 			}
 		]
 	},
@@ -3552,7 +3568,6 @@
 		"syntaxes": [
 			{
 				"extensions": [
-					"v",
 					"vlang"
 				],
 				"name": "Plain Text (V)",
@@ -3620,6 +3635,18 @@
 		],
 		"color": "sky"
 	},
+	"file_type_verilog": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"v"
+				],
+				"name": "Plain Text (Verilog)",
+				"scope": "source.verilog"
+			}
+		]
+	},
 	"file_type_vhdl": {
 		"color": "blue",
 		"syntaxes": [
@@ -3632,24 +3659,6 @@
 				],
 				"name": "Plain Text (VHDL)",
 				"scope": "source.vhdl"
-			},
-			{
-				"extensions": [
-					"sv",
-					"v",
-					"svh",
-					"vh"
-				],
-				"name": "Plain Text (SystemVerilog)",
-				"scope": "source.systemverilog"
-			},
-			{
-				"extensions": [
-					"v",
-					"V"
-				],
-				"name": "Plain Text (Verilog)",
-				"scope": "source.verilog"
 			}
 		]
 	},

diff --git a/icons/multi/file_type_systemverilog.png b/icons/multi/file_type_systemverilog.png
diff --git a/icons/multi/file_type_systemverilog@2x.png b/icons/multi/file_type_systemverilog@2x.png
diff --git a/icons/multi/file_type_systemverilog@3x.png b/icons/multi/file_type_systemverilog@3x.png
diff --git a/icons/multi/file_type_verilog.png b/icons/multi/file_type_verilog.png
diff --git a/icons/multi/file_type_verilog@2x.png b/icons/multi/file_type_verilog@2x.png
diff --git a/icons/multi/file_type_verilog@3x.png b/icons/multi/file_type_verilog@3x.png
diff --git a/icons/single/file_type_systemverilog.png b/icons/single/file_type_systemverilog.png
diff --git a/icons/single/file_type_systemverilog@2x.png b/icons/single/file_type_systemverilog@2x.png
diff --git a/icons/single/file_type_systemverilog@3x.png b/icons/single/file_type_systemverilog@3x.png
diff --git a/icons/single/file_type_verilog.png b/icons/single/file_type_verilog.png
diff --git a/icons/single/file_type_verilog@2x.png b/icons/single/file_type_verilog@2x.png
diff --git a/icons/single/file_type_verilog@3x.png b/icons/single/file_type_verilog@3x.png
diff --git a/icons/svg/file_type_systemverilog.svg b/icons/svg/file_type_systemverilog.svg
diff --git a/icons/svg/file_type_verilog.svg b/icons/svg/file_type_verilog.svg
diff --git a/preferences/file_type_systemverilog.tmPreferences b/preferences/file_type_systemverilog.tmPreferences
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.systemverilog</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_systemverilog</string>
+		</dict>
+	</dict>
+</plist>
diff --git a/preferences/file_type_tailwind.tmPreferences b/preferences/file_type_tailwind.tmPreferences
@@ -2,7 +2,7 @@
 <plist version="1.0">
 	<dict>
 		<key>scope</key>
-		<string>source.css.tailwind, source.js.tailwind, source.ts.tailwind</string>
+		<string>source.css.tailwind, source.js.tailwind, source.postcss.tailwind, source.ts.tailwind</string>
 		<key>settings</key>
 		<dict>
 			<key>icon</key>

diff --git a/preferences/file_type_verilog.tmPreferences b/preferences/file_type_verilog.tmPreferences
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.verilog</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_verilog</string>
+		</dict>
+	</dict>
+</plist>
diff --git a/preferences/file_type_vhdl.tmPreferences b/preferences/file_type_vhdl.tmPreferences
@@ -2,7 +2,7 @@
 <plist version="1.0">
 	<dict>
 		<key>scope</key>
-		<string>source.systemverilog, source.verilog, source.vhdl</string>
+		<string>source.vhdl</string>
 		<key>settings</key>
 		<dict>
 			<key>icon</key>

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,3 @@
-pip
-
 # Build
 cairosvg >= 2.7.0
 pypng >= 0.20220715.0

diff --git a/tests/file_type_v.v → tests/file_type_systemverilog.sv b/tests/file_type_v.v → tests/file_type_systemverilog.sv
diff --git a/tests/file_type_vhdl.sv → tests/file_type_systemverilog.svh b/tests/file_type_vhdl.sv → tests/file_type_systemverilog.svh
diff --git a/tests/file_type_vhdl.svh → tests/file_type_systemverilog.vh b/tests/file_type_vhdl.svh → tests/file_type_systemverilog.vh
diff --git a/tests/file_type_vhdl.v → tests/file_type_verilog.v b/tests/file_type_vhdl.v → tests/file_type_verilog.v
diff --git a/tests/file_type_vhdl.vh b/tests/file_type_vhdl.vh