Merge branch 'main' into cybertopia

Author: noraj

CHANGES.md

@@ -17,13 +17,28 @@ Core Grammars:
 - enh(csharp) add Contextual keywords `file`, `args`, `dynamic`, `record`, `required` and `scoped` [Alvin Joy][]
 - enh(lua) add 'pluto' as an alias [Sainan]
 - enh(bash) add reserved keywords `time` and `coproc` [Álvaro Mondéjar][]
+- enh(nix) update keywords [h7x4][]
+- enh(nix) support paths [h7x4][]
+- enh(nix) support lookup paths [h7x4][]
+- enh(nix) support operators [h7x4][]
+- enh(nix) support REPL keywords [h7x4][]
+- enh(nix) support markdown comments [h7x4][]
+- enh(nix) support basic function params [h7x4][]
+- enh(nix) better parsing of attrsets [h7x4][]
 - fix(c) - Fixed hex numbers with decimals  [Dxuian]
 - fix(typescript) - Fixedoptional property not highlighted correctly  [Dxuian]
 - fix(ruby) - fix `|=` operator false positives (as block arguments) [Aboobacker MK]
+- enh(gcode) rewrote language for modern gcode support [Barthélémy Bonhomme][]
 - fix(sql) - Fixed sql primary key and foreign key spacing issue   [Dxuian]
 - fix(cpp) added flat_set and flat_map as a part of cpp 23 version [Lavan]
 - fix(yaml) - Fixed special chars in yaml   [Dxuian]
 - fix(basic) - Fixed closing quotation marks not required for a PRINT statement [Somya]
+- fix(nix) remove `add` builtin [h7x4][]
+- fix(nix) mark `or` as builtin instead of literal [h7x4][]
+- fix(nix) handle `'''` string escapes [h7x4][]
+- fix(nix) handle backslash string escapes [h7x4][]
+- fix(nix) don't mix escapes for `"` and `''` strings [h7x4][]
+- fix(swift) - Fixed syntax highlighting for class func/var declarations [guuido]
 
 New Grammars:
 
@@ -61,8 +76,10 @@ CONTRIBUTORS
 [Osmocom]: https://github.com/osmocom
 [Álvaro Mondéjar]: https://github.com/mondeja
 [Alexandre ZANNI]: https://github.com/noraj
+[Barthélémy Bonhomme]: https://github.com/barthy-koeln
 [Lavan]: https://github.com/jvlavan
 [Somya]: https://github.com/somya-05
+[guuido]: https://github.com/guuido
 
 
 ## Version 11.10.0
@@ -174,7 +191,6 @@ Themes:
 [Chiel van de Steeg]: https://github.com/cvdsteeg
 
 
-
 ## Version 11.9.0
 
 CAVEATS / POTENTIALLY BREAKING CHANGES

src/languages/gcode.js

@@ -7,58 +7,170 @@
  */
 
 export default function(hljs) {
-  const GCODE_IDENT_RE = '[A-Z_][A-Z0-9_.]*';
-  const GCODE_CLOSE_RE = '%';
+  const regex = hljs.regex;
   const GCODE_KEYWORDS = {
-    $pattern: GCODE_IDENT_RE,
-    keyword: 'IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT '
-      + 'EQ LT GT NE GE LE OR XOR'
-  };
-  const GCODE_START = {
-    className: 'meta',
-    begin: '([O])([0-9]+)'
+    $pattern: /[A-Z]+|%/,
+    keyword: [
+      // conditions
+      'THEN',
+      'ELSE',
+      'ENDIF',
+      'IF',
+
+      // controls
+      'GOTO',
+      'DO',
+      'WHILE',
+      'WH',
+      'END',
+      'CALL',
+
+      // scoping
+      'SUB',
+      'ENDSUB',
+
+      // comparisons
+      'EQ',
+      'NE',
+      'LT',
+      'GT',
+      'LE',
+      'GE',
+      'AND',
+      'OR',
+      'XOR',
+
+      // start/end of program
+      '%'
+    ],
+    built_in: [
+      'ATAN',
+      'ABS',
+      'ACOS',
+      'ASIN',
+      'COS',
+      'EXP',
+      'FIX',
+      'FUP',
+      'ROUND',
+      'LN',
+      'SIN',
+      'SQRT',
+      'TAN',
+      'EXISTS'
+    ]
   };
-  const NUMBER = hljs.inherit(hljs.C_NUMBER_MODE, { begin: '([-+]?((\\.\\d+)|(\\d+)(\\.\\d*)?))|' + hljs.C_NUMBER_RE });
+
+
+  // TODO: post v12 lets use look-behind, until then \b and a callback filter will be used
+  // const LETTER_BOUNDARY_RE = /(?<![A-Z])/;
+  const LETTER_BOUNDARY_RE = /\b/;
+
+  function LETTER_BOUNDARY_CALLBACK(matchdata, response) {
+    if (matchdata.index === 0) {
+      return;
+    }
+
+    const charBeforeMatch = matchdata.input[matchdata.index - 1];
+    if (charBeforeMatch >= '0' && charBeforeMatch <= '9') {
+      return;
+    }
+
+    if (charBeforeMatch === '_') {
+      return;
+    }
+
+    response.ignoreMatch();
+  }
+
+  const NUMBER_RE = /[+-]?((\.\d+)|(\d+)(\.\d*)?)/;
+
+  const GENERAL_MISC_FUNCTION_RE = /[GM]\s*\d+(\.\d+)?/;
+  const TOOLS_RE = /T\s*\d+/;
+  const SUBROUTINE_RE = /O\s*\d+/;
+  const SUBROUTINE_NAMED_RE = /O<.+>/;
+  const AXES_RE = /[ABCUVWXYZ]\s*/;
+  const PARAMETERS_RE = /[FHIJKPQRS]\s*/;
+
   const GCODE_CODE = [
-    hljs.C_LINE_COMMENT_MODE,
-    hljs.C_BLOCK_COMMENT_MODE,
+    // comments
     hljs.COMMENT(/\(/, /\)/),
-    NUMBER,
-    hljs.inherit(hljs.APOS_STRING_MODE, { illegal: null }),
-    hljs.inherit(hljs.QUOTE_STRING_MODE, { illegal: null }),
+    hljs.COMMENT(/;/, /$/),
+    hljs.APOS_STRING_MODE,
+    hljs.QUOTE_STRING_MODE,
+    hljs.C_NUMBER_MODE,
+
+    // gcodes
     {
-      className: 'name',
-      begin: '([G])([0-9]+\\.?[0-9]?)'
+      scope: 'title.function',
+      variants: [
+        // G General functions: G0, G5.1, G5.2, …
+        // M Misc functions: M0, M55.6, M199, …
+        { match: regex.concat(LETTER_BOUNDARY_RE, GENERAL_MISC_FUNCTION_RE) },
+        {
+          begin: GENERAL_MISC_FUNCTION_RE,
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        },
+        // T Tools
+        { match: regex.concat(LETTER_BOUNDARY_RE, TOOLS_RE), },
+        {
+          begin: TOOLS_RE,
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        }
+      ]
     },
+
     {
-      className: 'name',
-      begin: '([M])([0-9]+\\.?[0-9]?)'
+      scope: 'symbol',
+      variants: [
+        // O Subroutine ID: O100, O110, …
+        { match: regex.concat(LETTER_BOUNDARY_RE, SUBROUTINE_RE) },
+        {
+          begin: SUBROUTINE_RE,
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        },
+        // O Subroutine name: O<some>, …
+        { match: regex.concat(LETTER_BOUNDARY_RE, SUBROUTINE_NAMED_RE) },
+        {
+          begin: SUBROUTINE_NAMED_RE,
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        },
+        // Checksum at end of line: *71, *199, …
+        { match: /\*\s*\d+\s*$/ }
+      ]
     },
+
     {
-      className: 'attr',
-      begin: '(VC|VS|#)',
-      end: '(\\d+)'
+      scope: 'operator', // N Line number: N1, N2, N1020, …
+      match: /^N\s*\d+/
     },
+
     {
-      className: 'attr',
-      begin: '(VZOFX|VZOFY|VZOFZ)'
+      scope: 'variable',
+      match: /-?#\s*\d+/
     },
+
     {
-      className: 'built_in',
-      begin: '(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)',
-      contains: [ NUMBER ],
-      end: '\\]'
+      scope: 'property', // Physical axes,
+      variants: [
+        { match: regex.concat(LETTER_BOUNDARY_RE, AXES_RE, NUMBER_RE) },
+        {
+          begin: regex.concat(AXES_RE, NUMBER_RE),
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        },
+      ]
     },
+
     {
-      className: 'symbol',
+      scope: 'params', // Different types of parameters
       variants: [
+        { match: regex.concat(LETTER_BOUNDARY_RE, PARAMETERS_RE, NUMBER_RE) },
         {
-          begin: 'N',
-          end: '\\d+',
-          illegal: '\\W'
-        }
+          begin: regex.concat(PARAMETERS_RE, NUMBER_RE),
+          'on:begin': LETTER_BOUNDARY_CALLBACK
+        },
       ]
-    }
+    },
   ];
 
   return {
@@ -67,13 +179,9 @@ export default function(hljs) {
     // Some implementations (CNC controls) of G-code are interoperable with uppercase and lowercase letters seamlessly.
     // However, most prefer all uppercase and uppercase is customary.
     case_insensitive: true,
+    // TODO: post v12 with the use of look-behind this can be enabled
+    disableAutodetect: true,
     keywords: GCODE_KEYWORDS,
-    contains: [
-      {
-        className: 'meta',
-        begin: GCODE_CLOSE_RE
-      },
-      GCODE_START
-    ].concat(GCODE_CODE)
+    contains: GCODE_CODE
   };
 }