Merge branch 'develop'

SublimeText · Apr 25, 2023 · fb44674 · fb44674
2 parents 0275194 + 7e5716a
commit fb44674
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 2 deletions.
diff --git a/icons/icons.json b/icons/icons.json
@@ -1337,6 +1337,19 @@
 			}
 		]
 	},
+	"file_type_kotlin_gradle": {
+		"aliases": [
+			{
+				"base": "source.Kotlin",
+				"extensions": [
+					"gradle.kts"
+				],
+				"name": "Kotlin (Gradle)",
+				"scope": "source.Kotlin.gradle"
+			}
+		],
+		"color": "blue"
+	},
 	"file_type_ksp": {
 		"color": "graphite",
 		"syntaxes": [
@@ -3103,10 +3116,19 @@
 	},
 	"file_type_yarn": {
 		"aliases": [
+			{
+				"base": "source.shell",
+				"extensions": [
+					".yarnrc"
+				],
+				"name": "Shell Script (Yarn)",
+				"scope": "source.shell.yarn"
+			},
 			{
 				"base": "source.yaml",
 				"extensions": [
-					"yarn.lock"
+					"yarn.lock",
+					".yarnrc.yml"
 				],
 				"name": "YAML (Yarn)",
 				"scope": "source.yaml.yarn"

diff --git a/icons/multi/file_type_kotlin_gradle.png b/icons/multi/file_type_kotlin_gradle.png
diff --git a/icons/multi/[email protected] b/icons/multi/[email protected]
diff --git a/icons/multi/[email protected] b/icons/multi/[email protected]
diff --git a/icons/single/file_type_kotlin_gradle.png b/icons/single/file_type_kotlin_gradle.png
diff --git a/icons/single/[email protected] b/icons/single/[email protected]
diff --git a/icons/single/[email protected] b/icons/single/[email protected]
diff --git a/icons/svg/file_type_kotlin_gradle.svg b/icons/svg/file_type_kotlin_gradle.svg
diff --git a/preferences/file_type_kotlin_gradle.tmPreferences b/preferences/file_type_kotlin_gradle.tmPreferences
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.Kotlin.gradle</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_kotlin_gradle</string>
+		</dict>
+	</dict>
+</plist>
diff --git a/preferences/file_type_yarn.tmPreferences b/preferences/file_type_yarn.tmPreferences
@@ -2,7 +2,7 @@
 <plist version="1.0">
 	<dict>
 		<key>scope</key>
-		<string>source.yaml.yarn</string>
+		<string>source.shell.yarn, source.yaml.yarn</string>
 		<key>settings</key>
 		<dict>
 			<key>icon</key>

diff --git a/tests/.yarnrc b/tests/.yarnrc
diff --git a/tests/.yarnrc.yml b/tests/.yarnrc.yml
diff --git a/tests/file_type_kotlin_gradle.gradle.kts b/tests/file_type_kotlin_gradle.gradle.kts