Merge branch 'develop'

Author: deathaxe

PACKAGES.md

@@ -209,6 +209,10 @@ This file contains a list of possible packages you may need to install to see th
 
 - [Siteleaf Liquid Syntax](https://packagecontrol.io/packages/Siteleaf%20Liquid%20Syntax)
 
+## LiveScript
+
+- [LiveScript](https://packagecontrol.io/packages/LiveScript)
+
 ## LSL
 
 - [LSL](https://packagecontrol.io/packages/LSL)

icons/icons.json

@@ -1816,6 +1816,18 @@
 			}
 		]
 	},
+	"file_type_livescript": {
+		"color": "sky",
+		"syntaxes": [
+			{
+				"extensions": [
+					"ls"
+				],
+				"name": "Plain Text (LiveScript)",
+				"scope": "source.livescript, source.LiveScript"
+			}
+		]
+	},
 	"file_type_lisp": {
 		"color": "red",
 		"syntaxes": [
@@ -1845,14 +1857,39 @@
 	},
 	"file_type_lock": {
 		"aliases": [
+			{
+				"base": "source.json",
+				"extensions": [
+					"package-lock.json"
+				],
+				"name": "JSON (Lock)",
+				"scope": "source.json.lock"
+			},
+			{
+				"base": "source.toml",
+				"extensions": [
+					"Cargo.lock",
+					"Gopkg.lock",
+					"uv.lock"
+				],
+				"name": "TOML (Lock)",
+				"scope": "source.toml.lock"
+			},
 			{
 				"base": "source.yaml",
 				"extensions": [
-					"Gemfile.lock",
-					"Berksfile.lock"
+					"yarn.lock"
 				],
 				"name": "YAML (Lock)",
 				"scope": "source.yaml.lock"
+			},
+			{
+				"extensions": [
+					"Gemfile.lock",
+					"Berksfile.lock"
+				],
+				"name": "Text Plain (Lock)",
+				"scope": "text.plain.lock"
 			}
 		],
 		"color": "red"
@@ -2180,7 +2217,6 @@
 			{
 				"base": "source.json",
 				"extensions": [
-					"package-lock.json",
 					"package.json"
 				],
 				"name": "JSON (NPM)",
@@ -2985,6 +3021,20 @@
 	},
 	"file_type_settings": {
 		"aliases": [
+			{
+				"extensions": [
+					"Doxyfile",
+					"DoxyfileTemplate",
+					"Doxyfile.version",
+					"Doxyfile.aliases",
+					"Doxyfile.rfc",
+					"Doxyfile.base",
+					"Doxyfile.inc",
+					"Doxyfile.include"
+				],
+				"name": "INI (Doxyfile)",
+				"scope": "source.ini.doxyfile"
+			},
 			{
 				"base": "source.json",
 				"extensions": [
@@ -3012,25 +3062,27 @@
 		"syntaxes": [
 			{
 				"extensions": [
-					"fmt",
+					".buckconfig",
+					".coveragerc",
+					".flake8",
+					".flowconfig",
+					".hgrc",
+					".pycodestyle",
+					".pylintrc",
+					".style.yapf",
+					"avpreset",
 					"cfg",
-					"ini",
+					"conf",
+					"desktop",
+					"ffpreset",
 					"inf",
+					"ini",
+					"lektorproject",
 					"lng",
-					"pbk",
+					"pycodestyle",
+					"pylintrc",
 					"url",
-					"conf",
-					"config",
-					"Doxyfile",
-					"DoxyfileTemplate",
-					"DoxyfileTemplate.cfg",
-					"Doxyfile.version",
-					"Doxyfile.aliases",
-					"Doxyfile.rfc",
-					"Doxyfile.base",
-					"Doxyfile.inc",
-					"Doxyfile.include",
-					"buildozer.spec"
+					"vlcrc"
 				],
 				"name": "Plain Text (INI)",
 				"scope": "source.ini"
@@ -3566,8 +3618,6 @@
 				"extensions": [
 					"toml",
 					"tml",
-					"Cargo.lock",
-					"Gopkg.lock",
 					"Pipfile"
 				],
 				"name": "Plain Text (TOML)",
@@ -4076,8 +4126,7 @@
 				"base": "source.yaml",
 				"extensions": [
 					".yarnrc.yaml",
-					".yarnrc.yml",
-					"yarn.lock"
+					".yarnrc.yml"
 				],
 				"name": "YAML (Yarn)",
 				"scope": "source.yaml.yarn"

icons/multi/file_type_livescript.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+	<dict>
+		<key>scope</key>
+		<string>source.LiveScript, source.livescript</string>
+		<key>settings</key>
+		<dict>
+			<key>icon</key>
+			<string>file_type_livescript</string>
+		</dict>
+	</dict>
+</plist>