Merge pull request #3 from real-marshal/master

feat: support yarn berry
mariusschulz · Sep 2, 2022 · d78dccc · d78dccc
2 parents 6caf36f + f91b23f
commit d78dccc
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/syntaxes/yarnlock.tmLanguage.json b/syntaxes/yarnlock.tmLanguage.json
@@ -6,7 +6,8 @@
         { "include": "#resolved-url" },
         { "include": "#integrity-hashes" },
         { "include": "#package-version" },
-        { "include": "#keywords" }
+        { "include": "#keywords" },
+        { "include": "#keywords-berry" }
     ],
     "repository": {
         "comments": {
@@ -26,7 +27,7 @@
         "integrity-hashes": {
             "patterns": [
                 {
-                    "begin": "(integrity)\\s+",
+                    "begin": "(integrity|checksum):?\\s+",
                     "beginCaptures": {
                         "1": {
                             "name": "keyword"
@@ -46,7 +47,15 @@
             "patterns": [
                 {
                     "name": "keyword",
-                    "match": "\\b(dependencies|integrity|name|optionalDependencies|resolved|version)\\b"
+                    "match": "\\b(dependencies|integrity|name|optionalDependencies|resolved|version)\\b[\\s|:]"
+                }
+            ]
+        },
+        "keywords-berry": {
+            "patterns": [
+                {
+                    "name": "keyword",
+                    "match": "\\b(version|cacheKey|resolution|dependencies|peerDependencies|peerDependenciesMeta|bin|checksum|languageName|linkType)\\b:"
                 }
             ]
         },
@@ -57,7 +66,7 @@
                     "match": "\"(?:\\*|[^\"a-zA-Z]*\\d[^\"a-zA-Z]*)\""
                 },
                 {
-                    "begin": "(version)\\s+",
+                    "begin": "(version):?\\s+",
                     "beginCaptures": {
                         "1": {
                             "name": "keyword"
@@ -67,7 +76,7 @@
                     "patterns": [
                         {
                             "name": "entity.name.function",
-                            "match": "\"?[^\"]+\"?"
+                            "match": "\"?[^\"\\n]+\"?"
                         }
                     ]
                 }