github-linguist 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dec419e8690419e864ac634093ae2fbce21eb3c3
-  data.tar.gz: 2dcf74335e132f0577ca4c83d8800133287a8941
+SHA256:
+  metadata.gz: 35065ab2750454f7ab539c87e3e493700fe763644b80e4a2517532d8826d1f71
+  data.tar.gz: eb3e092758f8e6943d9b6fe90a42b0288ccce7841756497db2dec12a8ba0e234
 SHA512:
-  metadata.gz: 5af0bce3c404d08cf684bc65d4f763a9320b5c481958d1075100c0d40e205b831bc3d6cc0be9500d162315a5fc5bc335aab85ec4091a246698e3b46cea2a0ba9
-  data.tar.gz: aeb3a5e5023ca8aec79354d40954990bd2e0b0cafab15f5b8afc583b1f7b199c7a6f6d6ed0f470bc7d7f14194cbb489649e193fdb05053346a2325cd44de6c06
+  metadata.gz: 71ac80b583d81ee8830556b74c34455b3bdc4f458b8d143e9f39f2dfa93d6e687d127562737ccceed49a3c05fa4a903021c8c30bfa935d6102e0d6c4f784dc97
+  data.tar.gz: fdcd032ce2303ae4e0cc0786bbccc3d7c040e3e4c2da9a791a5a1682146beb21a92b49b5c22f2f5707be176759efa7e84ba3378b41476d2b1b507e56360884cc

data/bin/git-linguist

@@ -6,7 +6,7 @@ require 'linguist'
 require 'rugged'
 require 'optparse'
 require 'json'
-require 'tmpdir'
+require 'tempfile'
 require 'zlib'
 
 class GitLinguist
@@ -76,17 +76,11 @@ class GitLinguist
   def write_cache(object)
     return unless File.directory? @repo_path
 
-    begin
-      tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
-      File.open(tmp_path, "wb") do |f|
-        marshal = Marshal.dump(object)
-        f.write(Zlib::Deflate.deflate(marshal))
-      end
-
-      File.rename(tmp_path, cache_file)
-    rescue => e
-      (File.unlink(tmp_path) rescue nil)
-      raise e
+    Tempfile.open('cache_file', @repo_path) do |f|
+      marshal = Marshal.dump(object)
+      f.write(Zlib::Deflate.deflate(marshal))
+      f.close
+      File.rename(f.path, cache_file)
     end
   end
 

data/ext/linguist/linguist.h

@@ -9,3 +9,10 @@ struct tokenizer_extra {
   char *token;
   enum tokenizer_type type;
 };
+
+#ifdef __APPLE__
+char *strndup(const char *s1, size_t n);
+#elif defined(_WIN32) || defined(_WIN64)
+char *strndup(const char *s1, size_t n);
+#pragma warning (disable: 4244)
+#endif // _WIN32 || _WIN64

data/ext/linguist/strndup.c

@@ -0,0 +1,10 @@
+#if defined(_WIN32) || defined(_WIN64)
+#include <math.h>
+char *strndup(const char *s1, size_t n)
+{
+	char *copy = (char *)malloc(n + 1);
+	memcpy(copy, s1, n);
+	copy[n] = 0;
+	return copy;
+}
+#endif

data/grammars/annotation.liquidhaskell.haskell.json

@@ -1030,6 +1030,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/hint.haskell.json

@@ -970,6 +970,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/hint.message.haskell.json

@@ -994,6 +994,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/hint.type.haskell.json

@@ -967,6 +967,9 @@
                 {
                   "name": "keyword.operator.wildcard.haskell",
                   "match": "\\.\\."
+                },
+                {
+                  "include": "#infix_op"
                 }
               ]
             },

data/grammars/source.apl.json

@@ -3,14 +3,14 @@
   "scopeName": "source.apl",
   "patterns": [
     {
-      "include": "#heredocs"
+      "name": "comment.line.shebang.apl",
+      "match": "\\A#!.*$"
     },
     {
-      "include": "#main"
+      "include": "#heredocs"
     },
     {
-      "name": "comment.line.shebang.apl",
-      "match": "\\A#!.*$"
+      "include": "#main"
     },
     {
       "contentName": "text.embedded.apl",
@@ -128,7 +128,7 @@
     "class": {
       "patterns": [
         {
-          "begin": "(?\u003c=\\s|^)((:)Class)\\s+('[^']*'?|[A-Za-z_∆⍙]+[\\w∆⍙¯]*)\\s*((:)\\s*(?:('[^']*'?|[A-Za-z_∆⍙]+[\\w∆⍙¯]*)\\s*)?)?(.*?)$",
+          "begin": "(?x)\n(?\u003c=\\s|^)\n((:)Class)\n\\s+\n(\n\t'[^']*'?\n\t|\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n)\n\\s*\n(\n\t(:)\n\t\\s*\n\t(?:\n\t\t(\n\t\t\t'[^']*'?\n\t\t\t|\n\t\t\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t\t\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n\t\t)\n\t\t\\s*\n\t)?\n)?\n(.*?)$",
           "end": "(?\u003c=\\s|^)((:)EndClass)(?=\\b)",
           "patterns": [
             {
@@ -146,7 +146,7 @@
                 },
                 {
                   "name": "entity.name.type.apl",
-                  "match": "('[^']*'?|[A-Za-z_∆⍙]+[\\w∆⍙¯]*)",
+                  "match": "(?x)\n(\n\t'[^']*'?\n\t|\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n)",
                   "captures": {
                     "1": {
                       "include": "#strings"
@@ -248,7 +248,7 @@
       "patterns": [
         {
           "name": "variable.parameter.switch.apl",
-          "begin": "(?\u003c=\\s)(-)([\\w∆⍙]+[\\w∆⍙¯]*)(=)",
+          "begin": "(?x)\n(?\u003c=\\s)(-)\n(\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n)\n(=)",
           "end": "\\b(?=\\s)",
           "patterns": [
             {
@@ -266,6 +266,18 @@
               "name": "punctuation.assignment.switch.apl"
             }
           }
+        },
+        {
+          "name": "variable.parameter.switch.apl",
+          "match": "(?x)\n(?\u003c=\\s)(-)\n(\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n)\n(?!=)",
+          "captures": {
+            "1": {
+              "name": "punctuation.delimiter.switch.apl"
+            },
+            "2": {
+              "name": "entity.name.switch.apl"
+            }
+          }
         }
       ]
     },
@@ -294,7 +306,7 @@
       "patterns": [
         {
           "name": "meta.function.apl",
-          "begin": "(?x) ^\\s*? (?# 1: keyword.operator.nabla.apl) (∇) (?: \\s* (?: (?# 2: entity.function.return-value.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*) | \\s* (?# 3: entity.function.return-value.shy.apl) ( (\\{)             (?# 4: punctuation.definition.return-value.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\})             (?# 5: punctuation.definition.return-value.end.apl) | (\\()             (?# 6: punctuation.definition.return-value.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\))             (?# 7: punctuation.definition.return-value.end.apl) | (\\(\\s*\\{)      (?# 8: punctuation.definition.return-value.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\}\\s*\\))      (?# 9: punctuation.definition.return-value.end.apl) | (\\{\\s*\\()      (?# 10: punctuation.definition.return-value.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\)\\s*\\})      (?# 11: punctuation.definition.return-value.end.apl) ) \\s* ) \\s* (?# 12: keyword.operator.assignment.apl) (←) )? \\s* (?: (?# MONADIC) (?: (?# 13: entity.function.name.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*) \\s* (?# 14: entity.function.axis.apl) ( (?# 15: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s* (?# 16: invalid.illegal.extra-characters.apl) (.*?) | (?# 17: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 18: punctuation.definition.axis.end.apl) (\\]) )? \\s*? (?# 19: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\])[A-Za-z_∆⍙][\\w∆⍙¯]* | (\\()   (?# 20: punctuation.definition.arguments.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\))   (?# 21: punctuation.definition.arguments.end.apl) ) \\s* (?=;|$) ) | (?# DYADIC/AMBIVALENT) (?#==================) (?: (?# 22: entity.function.arguments.left.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*\\s+) | (?# 23: entity.function.arguments.left.optional.apl) ( (\\{)          (?# 24: punctuation.definition.arguments.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\})          (?# 25: punctuation.definition.arguments.end.apl) | (\\(\\s*\\{)   (?# 26: punctuation.definition.arguments.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\}\\s*\\))   (?# 27: punctuation.definition.arguments.end.apl) | (\\{\\s*\\()   (?# 28: punctuation.definition.arguments.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\)\\s*\\})   (?# 29: punctuation.definition.arguments.end.apl) ) )? \\s* (?: (?# 30: entity.function.name.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*) \\s* (?# 31: entity.function.axis.apl) ( (?# 32: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s* (?# 33: invalid.illegal.extra-characters.apl) (.*?) | (?# 34: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 35: punctuation.definition.axis.end.apl) (\\]) )? | (?# 36: entity.function.operands.apl) ( (?# 37: punctuation.definition.operands.begin.apl) (\\() (?# 38: entity.function.operands.left.apl) (\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*)? \\s* (?# 39: entity.function.name.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*) \\s*? (?# 40: entity.function.axis.apl) ( (?# 41: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s* (?# 42: invalid.illegal.extra-characters.apl) (.*?) | (?# 43: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 44: punctuation.definition.axis.end.apl) (\\]) )? \\s* (?# 45: entity.function.operands.right.apl) ([A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)? (?# 46: punctuation.definition.operands.end.apl) (\\)) ) ) \\s* (?# 47: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\])[A-Za-z_∆⍙][\\w∆⍙¯]* | \\s* (\\()   (?# 48: punctuation.definition.arguments.begin.apl) (?:\\s*[A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)* (\\))   (?# 49: punctuation.definition.arguments.end.apl) )? (?#==================) ) \\s* (?# 50: invalid.illegal.arguments.right.apl) ([^;]+)? (?# 51: entity.function.local-variables.apl) ( (?# 52: Include “;”) ( (?: \\s* ; (?:\\s*[⎕A-Za-z_∆⍙][\\w∆⍙¯]*\\s*)+ )+ ) | (?# 53: invalid.illegal.local-variables.apl) ([^⍝]+) )? \\s* (?# 54: comment.line.apl) (⍝.*)? $",
+          "begin": "(?x) ^\\s*? (?# 1: keyword.operator.nabla.apl) (∇) (?: \\s* (?: (?# 2: entity.function.return-value.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) | \\s* (?# 3: entity.function.return-value.shy.apl) ( (\\{)             (?# 4: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})             (?# 5: punctuation.definition.return-value.end.apl) | (\\()             (?# 6: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))             (?# 7: punctuation.definition.return-value.end.apl) | (\\(\\s*\\{)      (?# 8: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))      (?# 9: punctuation.definition.return-value.end.apl) | (\\{\\s*\\()      (?# 10: punctuation.definition.return-value.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})      (?# 11: punctuation.definition.return-value.end.apl) ) \\s* ) \\s* (?# 12: keyword.operator.assignment.apl) (←) )? \\s* (?: (?# MONADIC) (?: (?# 13: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 14: entity.function.axis.apl) ( (?# 15: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 16: invalid.illegal.extra-characters.apl) (.*?) | (?# 17: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 18: punctuation.definition.axis.end.apl) (\\]) )? \\s*? (?# 19: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | (\\()   (?# 20: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 21: punctuation.definition.arguments.end.apl) ) \\s* (?=;|$) ) | (?# DYADIC/AMBIVALENT) (?#==================) (?: (?# 22: entity.function.arguments.left.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s+ ) | (?# 23: entity.function.arguments.left.optional.apl) ( (\\{)          (?# 24: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\})          (?# 25: punctuation.definition.arguments.end.apl) | (\\(\\s*\\{)   (?# 26: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\}\\s*\\))   (?# 27: punctuation.definition.arguments.end.apl) | (\\{\\s*\\()   (?# 28: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\)\\s*\\})   (?# 29: punctuation.definition.arguments.end.apl) ) )? \\s* (?: (?# 30: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s* (?# 31: entity.function.axis.apl) ( (?# 32: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 33: invalid.illegal.extra-characters.apl) (.*?) | (?# 34: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 35: punctuation.definition.axis.end.apl) (\\]) )? | (?# 36: entity.function.operands.apl) ( (?# 37: punctuation.definition.operands.begin.apl) (\\() (?# 38: entity.function.operands.left.apl) ( \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* )? \\s* (?# 39: entity.function.name.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* ) \\s*? (?# 40: entity.function.axis.apl) ( (?# 41: punctuation.definition.axis.begin.apl) (\\[) \\s* (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* (?# 42: invalid.illegal.extra-characters.apl) (.*?) | (?# 43: invalid.illegal.apl) ([^\\]]*) ) \\s* (?# 44: punctuation.definition.axis.end.apl) (\\]) )? \\s* (?# 45: entity.function.operands.right.apl) ( [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )? (?# 46: punctuation.definition.operands.end.apl) (\\)) ) ) \\s* (?# 47: entity.function.arguments.right.apl) ( (?\u003c=\\s|\\]) [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* | \\s* (\\()   (?# 48: punctuation.definition.arguments.begin.apl) (?: \\s* [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )* (\\))   (?# 49: punctuation.definition.arguments.end.apl) )? (?#==================) ) \\s* (?# 50: invalid.illegal.arguments.right.apl) ([^;]+)? (?# 51: entity.function.local-variables.apl) ( (?# 52: Include “;”) ( (?: \\s* ; (?: \\s* [⎕A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ] [A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]* \\s* )+ )+ ) | (?# 53: invalid.illegal.local-variables.apl) ([^⍝]+) )? \\s* (?# 54: comment.line.apl) (⍝.*)? $",
           "end": "^\\s*?(?:(∇)|(⍫))\\s*?(⍝.*?)?$",
           "patterns": [
             {
@@ -318,7 +330,16 @@
               "name": "keyword.operator.assignment.apl"
             },
             "13": {
-              "name": "entity.function.name.apl"
+              "name": "entity.function.name.apl",
+              "captures": {
+                "0": {
+                  "patterns": [
+                    {
+                      "include": "#embolden"
+                    }
+                  ]
+                }
+              }
             },
             "14": {
               "name": "entity.function.axis.apl"
@@ -375,7 +396,12 @@
               "name": "entity.function.return-value.shy.apl"
             },
             "30": {
-              "name": "entity.function.name.apl"
+              "name": "entity.function.name.apl",
+              "patterns": [
+                {
+                  "include": "#embolden"
+                }
+              ]
             },
             "31": {
               "name": "entity.function.axis.apl"
@@ -402,7 +428,12 @@
               "name": "entity.function.operands.left.apl"
             },
             "39": {
-              "name": "entity.function.name.apl"
+              "name": "entity.function.name.apl",
+              "patterns": [
+                {
+                  "include": "#embolden"
+                }
+              ]
             },
             "4": {
               "name": "punctuation.definition.return-value.begin.apl"
@@ -511,54 +542,9 @@
         }
       ]
     },
-    "float": {
-      "patterns": [
-        {
-          "name": "constant.numeric.float.apl",
-          "match": "\\b(\\d+)(\\.)(\\d*([Ee]¯?\\d+)?)",
-          "captures": {
-            "1": {
-              "name": "leading.decimal"
-            },
-            "2": {
-              "name": "decimal.separator"
-            },
-            "3": {
-              "name": "trailing.decimal"
-            },
-            "4": {
-              "name": "exponential.decimal"
-            }
-          }
-        },
-        {
-          "name": "constant.numeric.float.no-trailing-digits.apl",
-          "match": "\\b(\\d+)(\\.)(?!\\w)",
-          "captures": {
-            "1": {
-              "name": "leading.decimal"
-            },
-            "2": {
-              "name": "decimal.separator"
-            }
-          }
-        },
-        {
-          "name": "constant.numeric.float.no-leading-digits.apl",
-          "match": "(?\u003c!\\w)(\\.)(\\d+([Ee]¯?\\d+)?)",
-          "captures": {
-            "1": {
-              "name": "decimal.separator"
-            },
-            "2": {
-              "name": "trailing.decimal"
-            },
-            "3": {
-              "name": "exponential.decimal"
-            }
-          }
-        }
-      ]
+    "embolden": {
+      "name": "markup.bold.identifier.apl",
+      "match": ".+"
     },
     "heredocs": {
       "patterns": [
@@ -753,23 +739,11 @@
         }
       ]
     },
-    "int": {
-      "patterns": [
-        {
-          "name": "constant.numeric.int.exponential.apl",
-          "match": "\\b\\d+[Ee]¯?\\d+"
-        },
-        {
-          "name": "constant.numeric.int.basic.apl",
-          "match": "\\b\\d+(?!\\.?[Ee][\\d¯])"
-        }
-      ]
-    },
     "label": {
       "patterns": [
         {
           "name": "meta.label.apl",
-          "match": "^\\s*([A-Za-z_∆⍙]+[\\w∆⍙¯]*)(:)",
+          "match": "(?x)\n^\\s*\n(\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n\t[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*\n)\n(:)",
           "captures": {
             "1": {
               "name": "entity.label.name.apl"
@@ -807,27 +781,35 @@
     "lambda-variables": {
       "patterns": [
         {
-          "name": "variable.lambda.operands.left.apl",
+          "name": "constant.language.lambda.operands.left.apl",
           "match": "⍺⍺"
         },
         {
-          "name": "variable.lambda.operands.right.apl",
+          "name": "constant.language.lambda.operands.right.apl",
           "match": "⍵⍵"
         },
         {
-          "name": "variable.lambda.arguments.left.apl",
+          "name": "constant.language.lambda.arguments.left.apl",
           "match": "[⍺⍶]"
         },
         {
-          "name": "variable.lambda.arguments.right.apl",
+          "name": "constant.language.lambda.arguments.right.apl",
           "match": "[⍵⍹]"
         },
         {
-          "name": "variable.lambda.arguments.axis.apl",
+          "name": "constant.language.lambda.arguments.axis.apl",
           "match": "χ"
         },
         {
-          "name": "variable.lambda.symbol.apl",
+          "name": "constant.language.lambda.operands.self.operator.apl",
+          "match": "∇∇"
+        },
+        {
+          "name": "constant.language.lambda.operands.self.function.apl",
+          "match": "∇"
+        },
+        {
+          "name": "constant.language.lambda.symbol.apl",
           "match": "λ"
         }
       ]
@@ -853,13 +835,7 @@
           "include": "#strings"
         },
         {
-          "include": "#float"
-        },
-        {
-          "include": "#int"
-        },
-        {
-          "include": "#name"
+          "include": "#number"
         },
         {
           "include": "#lambda"
@@ -869,28 +845,28 @@
         },
         {
           "include": "#symbols"
+        },
+        {
+          "include": "#name"
         }
       ]
     },
     "name": {
-      "patterns": [
-        {
-          "name": "storage.type.name.apl",
-          "match": "[A-Za-z_∆⍙]+[\\w∆⍙¯]*"
-        }
-      ]
+      "name": "variable.other.readwrite.apl",
+      "match": "(?x)\n[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ]\n[A-Z_a-zÀ-ÖØ-Ýßà-öø-üþ∆⍙Ⓐ-Ⓩ¯0-9]*"
+    },
+    "number": {
+      "name": "constant.numeric.apl",
+      "match": "(?:[¯0-9]|\\.[0-9])[¯0-9A-Za-z]*"
     },
     "sck": {
       "patterns": [
         {
           "name": "keyword.control.sck.apl",
-          "match": "(?\u003c=\\s|^)(:)([A-Za-z]+)",
+          "match": "(?\u003c=\\s|^)(:)[A-Za-z]+",
           "captures": {
             "1": {
               "name": "punctuation.definition.sck.begin.apl"
-            },
-            "2": {
-              "name": "entity.sck.name.apl"
             }
           }
         }
@@ -1176,6 +1152,14 @@
           "name": "keyword.operator.thorn.apl",
           "match": "⍕"
         },
+        {
+          "name": "keyword.operator.underbar-shoe-left.apl",
+          "match": "⊆"
+        },
+        {
+          "name": "keyword.operator.underbar-iota.apl",
+          "match": "⍸"
+        },
         {
           "name": "keyword.operator.each.apl",
           "match": "¨"
@@ -1216,6 +1200,14 @@
           "name": "keyword.operator.i-beam.apl",
           "match": "⌶"
         },
+        {
+          "name": "keyword.operator.quad-diamond.apl",
+          "match": "⌺"
+        },
+        {
+          "name": "keyword.operator.at.apl",
+          "match": "@"
+        },
         {
           "name": "keyword.operator.lozenge.apl",
           "match": "◊"
@@ -1244,10 +1236,6 @@
           "name": "keyword.operator.diamond.apl",
           "match": "⋄"
         },
-        {
-          "name": "keyword.operator.nabla.apl",
-          "match": "∇"
-        },
         {
           "name": "keyword.operator.lock.apl",
           "match": "⍫"
@@ -1257,8 +1245,12 @@
           "match": "⎕"
         },
         {
-          "name": "keyword.operator.quad-diamond.apl",
-          "match": "⌺"
+          "name": "constant.language.namespace.parent.apl",
+          "match": "##"
+        },
+        {
+          "name": "constant.language.namespace.root.apl",
+          "match": "#"
         },
         {
           "name": "keyword.operator.quad-jot.apl",
@@ -1403,19 +1395,18 @@
         {
           "name": "keyword.operator.quad-question.apl",
           "match": "⍰"
-        },
-        {
-          "name": "keyword.operator.underbar-iota.apl",
-          "match": "⍸"
         }
       ]
     },
     "sysvars": {
       "name": "support.system.variable.apl",
-      "match": "(⎕)[A-Z]*",
+      "match": "(?:(⎕)|(⍞))[A-Za-z]*",
       "captures": {
         "1": {
           "name": "punctuation.definition.quad.apl"
+        },
+        "2": {
+          "name": "punctuation.definition.quad-quote.apl"
         }
       }
     }