@openui5/sap.ui.codeeditor 1.133.1 → 1.135.0

package/src/sap/ui/codeeditor/js/ace/mode-ruby.js

@@ -2,23 +2,23 @@ ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/li
 var oop = require("../lib/oop");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var constantOtherSymbol = exports.constantOtherSymbol = {
-    token: "constant.other.symbol.ruby",
+    token: "constant.other.symbol.ruby", // symbol
     regex: "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 exports.qString = {
-    token: "string",
+    token: "string", // single line
     regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 exports.qqString = {
-    token: "string",
+    token: "string", // single line
     regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 exports.tString = {
-    token: "string",
+    token: "string", // backtick string
     regex: "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
 var constantNumericHex = exports.constantNumericHex = {
-    token: "constant.numeric",
+    token: "constant.numeric", // hex
     regex: "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 var constantNumericBinary = exports.constantNumericBinary = {
@@ -29,24 +29,24 @@ var constantNumericDecimal = exports.constantNumericDecimal = {
     token: "constant.numeric",
     regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
 };
-var constantNumericOctal = exports.constantNumericDecimal = {
+var constantNumericOctal = exports.constantNumericOctal = {
     token: "constant.numeric",
     regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
 };
 var constantNumericRational = exports.constantNumericRational = {
-    token: "constant.numeric",
+    token: "constant.numeric", //rational + complex
     regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
 };
 var constantNumericComplex = exports.constantNumericComplex = {
-    token: "constant.numeric",
+    token: "constant.numeric", //simple complex numbers
     regex: /\b([\d]i)\b/
 };
 var constantNumericFloat = exports.constantNumericFloat = {
-    token: "constant.numeric",
+    token: "constant.numeric", // float + complex
     regex: "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 var instanceVariable = exports.instanceVariable = {
-    token: "variable.instance",
+    token: "variable.instance", // instance variable
     regex: "@{1,2}[a-zA-Z_\\d]+"
 };
 var RubyHighlightRules = function () {
@@ -111,7 +111,7 @@ var RubyHighlightRules = function () {
                 token: "comment",
                 regex: "#.*$"
             }, {
-                token: "comment.multiline",
+                token: "comment.multiline", // multi line comment
                 regex: "^=begin(?=$|\\s.*$)",
                 next: "comment"
             }, {
@@ -167,7 +167,7 @@ var RubyHighlightRules = function () {
                             defaultToken: "string"
                         }]
                 }, {
-                    token: "string.start",
+                    token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
                     regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
                         if (stack.length)
                             stack = [];
@@ -177,7 +177,7 @@ var RubyHighlightRules = function () {
                         return this.token;
                     }
                 }, {
-                    token: "string.start",
+                    token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
                     regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
                         if (stack.length)
                             stack = [];
@@ -187,7 +187,7 @@ var RubyHighlightRules = function () {
                         return this.token;
                     }
                 }, {
-                    token: "constant.other.symbol.ruby",
+                    token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
                     regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
                         if (stack.length)
                             stack = [];
@@ -197,7 +197,7 @@ var RubyHighlightRules = function () {
                         return this.token;
                     }
                 }, {
-                    token: "constant.other.symbol.ruby",
+                    token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
                     regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
                         if (stack.length)
                             stack = [];
@@ -218,15 +218,15 @@ var RubyHighlightRules = function () {
                     }
                 }],
             {
-                token: "punctuation",
+                token: "punctuation", // namespaces aren't symbols
                 regex: "::"
             },
             instanceVariable,
             {
-                token: "variable.global",
+                token: "variable.global", // global variable
                 regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token: "support.class",
+                token: "support.class", // class name
                 regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
                 token: ["punctuation.operator", "support.function"],
@@ -340,16 +340,16 @@ var RubyHighlightRules = function () {
         ],
         "comment": [
             {
-                token: "comment.multiline",
+                token: "comment.multiline", // closing comment
                 regex: "^=end(?=$|\\s.*$)",
                 next: "start"
             }, {
-                token: "comment",
+                token: "comment", // comment spanning whole line
                 regex: ".+"
             }
         ],
         "qStateWithInterpolation": [{
-                token: "string.start",
+                token: "string.start", // excluded nested |^% due to difficulty in realization
                 regex: /[(\[<{]/, onMatch: function (val, state, stack) {
                     if (stack.length && val === stack[0]) {
                         stack.unshift(val, state);
@@ -382,7 +382,7 @@ var RubyHighlightRules = function () {
                 defaultToken: "string"
             }],
         "qStateWithoutInterpolation": [{
-                token: "string.start",
+                token: "string.start", // excluded nested |^% due to difficulty in realization
                 regex: /[(\[<{]/, onMatch: function (val, state, stack) {
                     if (stack.length && val === stack[0]) {
                         stack.unshift(val, state);
@@ -411,7 +411,7 @@ var RubyHighlightRules = function () {
                 defaultToken: "string"
             }],
         "sStateWithoutInterpolation": [{
-                token: "constant.other.symbol.ruby",
+                token: "constant.other.symbol.ruby", // excluded nested |^% due to difficulty in realization
                 regex: /[(\[<{]/, onMatch: function (val, state, stack) {
                     if (stack.length && val === stack[0]) {
                         stack.unshift(val, state);
@@ -434,7 +434,7 @@ var RubyHighlightRules = function () {
                 defaultToken: "constant.other.symbol.ruby"
             }],
         "sStateWithInterpolation": [{
-                token: "constant.other.symbol.ruby",
+                token: "constant.other.symbol.ruby", // excluded nested |^% due to difficulty in realization
                 regex: /[(\[<{]/, onMatch: function (val, state, stack) {
                     if (stack.length && val === stack[0]) {
                         stack.unshift(val, state);
@@ -467,7 +467,7 @@ var RubyHighlightRules = function () {
                 defaultToken: "constant.other.symbol.ruby"
             }],
         "rState": [{
-                token: "string.regexp",
+                token: "string.regexp", // excluded nested |^% due to difficulty in realization
                 regex: /[(\[<{]/, onMatch: function (val, state, stack) {
                     if (stack.length && val === stack[0]) {
                         stack.unshift(val, state);

package/src/sap/ui/codeeditor/js/ace/mode-rust.js

@@ -8,7 +8,7 @@ var DocCommentHighlightRules = function () {
                 token: "comment.doc.tag",
                 regex: "@\\w+(?=\\s|$)"
             }, DocCommentHighlightRules.getTagRule(), {
-                defaultToken: "comment.doc",
+                defaultToken: "comment.doc.body",
                 caseInsensitive: true
             }
         ]
@@ -23,14 +23,14 @@ DocCommentHighlightRules.getTagRule = function (start) {
 };
 DocCommentHighlightRules.getStartRule = function (start) {
     return {
-        token: "comment.doc",
-        regex: "\\/\\*(?=\\*)",
+        token: "comment.doc", // doc comment
+        regex: /\/\*\*(?!\/)/,
         next: start
     };
 };
 DocCommentHighlightRules.getEndRule = function (start) {
     return {
-        token: "comment.doc",
+        token: "comment.doc", // closing comment
         regex: "\\*\\/",
         next: start
     };
@@ -67,7 +67,7 @@ var RustHighlightRules = function () {
     this.$rules = {
         start: [
             {
-                token: 'variable.other.source.rust',
+                token: 'variable.other.source.rust', // `(?![\\\'])` to keep a lifetime name highlighting from continuing one character
                 regex: '\'' + wordPattern + '(?![\\\'])'
             }, {
                 token: 'string.quoted.single.source.rust',
@@ -119,14 +119,14 @@ var RustHighlightRules = function () {
                 ]
             }, {
                 token: ['keyword.source.rust', 'text', 'entity.name.function.source.rust', 'punctuation'],
-                regex: '\\b(fn)(\\s+)((?:r#)?' + wordPattern + ')(<)',
+                regex: '\\b(fn)(\\s+)((?:r#)?' + wordPattern + ')(<)(?!<)',
                 push: "generics"
             }, {
                 token: ['keyword.source.rust', 'text', 'entity.name.function.source.rust'],
                 regex: '\\b(fn)(\\s+)((?:r#)?' + wordPattern + ')'
             }, {
                 token: ['support.constant', "punctuation"],
-                regex: "(" + wordPattern + '::)(<)',
+                regex: "(" + wordPattern + '::)(<)(?!<)',
                 push: "generics"
             }, {
                 token: 'support.constant',
@@ -160,22 +160,22 @@ var RustHighlightRules = function () {
                 ]
             }, {
                 token: ["keyword.source.rust", "identifier", "punctuaction"],
-                regex: "(?:(impl)|(" + wordPattern + "))(<)",
+                regex: "(?:(impl)|(" + wordPattern + "))(<)(?!<)",
                 stateName: 'generics',
                 push: [
                     {
+                        token: 'keyword.operator',
+                        regex: /<<|=/
+                    }, {
                         token: "punctuaction",
-                        regex: "<",
+                        regex: "<(?!<)",
                         push: "generics"
                     }, {
-                        token: 'variable.other.source.rust',
+                        token: 'variable.other.source.rust', // `(?![\\\'])` to keep a lifetime name highlighting from continuing one character
                         regex: '\'' + wordPattern + '(?![\\\'])'
                     }, {
                         token: "storage.type.source.rust",
                         regex: "\\b(u8|u16|u32|u64|u128|usize|i8|i16|i32|i64|i128|isize|char|bool)\\b"
-                    }, {
-                        token: "punctuation.operator",
-                        regex: "[,:]"
                     }, {
                         token: "keyword",
                         regex: "\\b(?:const|dyn)\\b"
@@ -183,39 +183,46 @@ var RustHighlightRules = function () {
                         token: "punctuation",
                         regex: ">",
                         next: "pop"
-                    }, {
-                        token: "paren.lparen",
-                        regex: "[(]"
-                    }, {
-                        token: "paren.rparen",
-                        regex: "[)]"
-                    }, {
+                    },
+                    { include: "punctuation" },
+                    { include: "operators" },
+                    { include: "constants" },
+                    {
                         token: "identifier",
                         regex: "\\b" + wordPattern + "\\b"
-                    }, {
-                        token: 'keyword.operator',
-                        regex: "="
                     }
                 ]
             }, {
                 token: keywordMapper,
                 regex: wordPattern
             }, {
-                token: 'keyword.operator',
-                regex: /\$|[-=]>|[-+%^=!&|<>]=?|[*/](?![*/])=?/
-            }, {
-                token: "punctuation.operator",
-                regex: /[?:,;.]/
-            }, {
+                token: 'meta.preprocessor.source.rust',
+                regex: '\\b\\w\\(\\w\\)*!|#\\[[\\w=\\(\\)_]+\\]\\b'
+            },
+            { include: "punctuation" },
+            { include: "operators" },
+            { include: "constants" }
+        ],
+        punctuation: [
+            {
                 token: "paren.lparen",
                 regex: /[\[({]/
             }, {
                 token: "paren.rparen",
                 regex: /[\])}]/
             }, {
-                token: 'meta.preprocessor.source.rust',
-                regex: '\\b\\w\\(\\w\\)*!|#\\[[\\w=\\(\\)_]+\\]\\b'
-            }, {
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
+            }
+        ],
+        operators: [
+            {
+                token: 'keyword.operator', // `[*/](?![*/])=?` is separated because `//` and `/* */` become comments and must be
+                regex: /\$|[-=]>|[-+%^=!&|<>]=?|[*/](?![*/])=?/
+            }
+        ],
+        constants: [
+            {
                 token: 'constant.numeric.source.rust',
                 regex: /\b(?:0x[a-fA-F0-9_]+|0o[0-7_]+|0b[01_]+|[0-9][0-9_]*(?!\.))(?:[iu](?:size|8|16|32|64|128))?\b/
             }, {

package/src/sap/ui/codeeditor/js/ace/mode-sac.js

@@ -8,7 +8,7 @@ var DocCommentHighlightRules = function () {
                 token: "comment.doc.tag",
                 regex: "@\\w+(?=\\s|$)"
             }, DocCommentHighlightRules.getTagRule(), {
-                defaultToken: "comment.doc",
+                defaultToken: "comment.doc.body",
                 caseInsensitive: true
             }
         ]
@@ -23,14 +23,14 @@ DocCommentHighlightRules.getTagRule = function (start) {
 };
 DocCommentHighlightRules.getStartRule = function (start) {
     return {
-        token: "comment.doc",
-        regex: "\\/\\*(?=\\*)",
+        token: "comment.doc", // doc comment
+        regex: /\/\*\*(?!\/)/,
         next: start
     };
 };
 DocCommentHighlightRules.getEndRule = function (start) {
     return {
-        token: "comment.doc",
+        token: "comment.doc", // closing comment
         regex: "\\*\\/",
         next: start
     };
@@ -83,11 +83,11 @@ var sacHighlightRules = function () {
             },
             DocCommentHighlightRules.getStartRule("doc-start"),
             {
-                token: "comment",
+                token: "comment", // multi line comment
                 regex: "\\/\\*",
                 next: "comment"
             }, {
-                token: "string",
+                token: "string", // character
                 regex: "'(?:" + escapeRe + "|.)?'"
             }, {
                 token: "string.start",
@@ -109,17 +109,17 @@ var sacHighlightRules = function () {
                     { defaultToken: "string" }
                 ]
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex
                 regex: "0[xX][0-9a-fA-F]+(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // float
                 regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b"
             }, {
-                token: "keyword",
+                token: "keyword", // pre-compiler directives
                 regex: "#\\s*(?:include|import|pragma|line|define|undef)\\b",
                 next: "directive"
             }, {
-                token: "keyword",
+                token: "keyword", // special case pre-compiler directive
                 regex: "#\\s*(?:endif|if|ifdef|else|elif|ifndef)\\b"
             }, {
                 token: "support.function",
@@ -146,7 +146,7 @@ var sacHighlightRules = function () {
         ],
         "comment": [
             {
-                token: "comment",
+                token: "comment", // closing comment
                 regex: "\\*\\/",
                 next: "start"
             }, {
@@ -181,12 +181,12 @@ var sacHighlightRules = function () {
                 next: "start"
             },
             {
-                token: "constant.other",
+                token: "constant.other", // single line
                 regex: '\\s*["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]',
                 next: "start"
             },
             {
-                token: "constant.other",
+                token: "constant.other", // single line
                 regex: "\\s*['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']",
                 next: "start"
             },

package/src/sap/ui/codeeditor/js/ace/mode-sass.js

@@ -74,7 +74,7 @@ var CssHighlightRules = function () {
                     + "|swash|ornaments|annotation|stylistic|styleset|character-variant)"
             }],
         "comments": [{
-                token: "comment",
+                token: "comment", // multi line comment
                 regex: "\\/\\*",
                 push: [{
                         token: "comment",
@@ -103,10 +103,10 @@ var CssHighlightRules = function () {
                 token: "constant.numeric",
                 regex: numRe
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex6 color
                 regex: "#[a-f0-9]{6}"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex3 color
                 regex: "#[a-f0-9]{3}"
             }, {
                 token: ["punctuation", "entity.other.attribute-name.pseudo-element.css"],
@@ -119,6 +119,9 @@ var CssHighlightRules = function () {
             }, {
                 token: keywordMapper,
                 regex: "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+            }, {
+                token: "paren.lparen",
+                regex: "\\{"
             }, {
                 caseInsensitive: true
             }],
@@ -210,31 +213,31 @@ var ScssHighlightRules = function () {
                 regex: "\\/\\/.*$"
             },
             {
-                token: "comment",
+                token: "comment", // multi line comment
                 regex: "\\/\\*",
                 next: "comment"
             }, {
-                token: "string",
+                token: "string", // single line
                 regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
             }, {
-                token: "string",
+                token: "string", // multi line string start
                 regex: '["].*\\\\$',
                 next: "qqstring"
             }, {
-                token: "string",
+                token: "string", // single line
                 regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
             }, {
-                token: "string",
+                token: "string", // multi line string start
                 regex: "['].*\\\\$",
                 next: "qstring"
             }, {
                 token: "constant.numeric",
                 regex: numRe + "(?:ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vm|vw|%)"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex6 color
                 regex: "#[a-f0-9]{6}"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex3 color
                 regex: "#[a-f0-9]{3}"
             }, {
                 token: "constant.numeric",
@@ -293,7 +296,7 @@ var ScssHighlightRules = function () {
         ],
         "comment": [
             {
-                token: "comment",
+                token: "comment", // closing comment
                 regex: "\\*\\/",
                 next: "start"
             }, {

package/src/sap/ui/codeeditor/js/ace/mode-scad.js

@@ -8,7 +8,7 @@ var DocCommentHighlightRules = function () {
                 token: "comment.doc.tag",
                 regex: "@\\w+(?=\\s|$)"
             }, DocCommentHighlightRules.getTagRule(), {
-                defaultToken: "comment.doc",
+                defaultToken: "comment.doc.body",
                 caseInsensitive: true
             }
         ]
@@ -23,14 +23,14 @@ DocCommentHighlightRules.getTagRule = function (start) {
 };
 DocCommentHighlightRules.getStartRule = function (start) {
     return {
-        token: "comment.doc",
-        regex: "\\/\\*(?=\\*)",
+        token: "comment.doc", // doc comment
+        regex: /\/\*\*(?!\/)/,
         next: start
     };
 };
 DocCommentHighlightRules.getEndRule = function (start) {
     return {
-        token: "comment.doc",
+        token: "comment.doc", // closing comment
         regex: "\\*\\/",
         next: start
     };
@@ -58,34 +58,34 @@ var scadHighlightRules = function () {
             },
             DocCommentHighlightRules.getStartRule("start"),
             {
-                token: "comment",
+                token: "comment", // multi line comment
                 regex: "\\/\\*",
                 next: "comment"
             }, {
-                token: "string",
+                token: "string", // single line
                 regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
             }, {
-                token: "string",
+                token: "string", // multi line string start
                 regex: '["].*\\\\$',
                 next: "qqstring"
             }, {
-                token: "string",
+                token: "string", // single line
                 regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
             }, {
-                token: "string",
+                token: "string", // multi line string start
                 regex: "['].*\\\\$",
                 next: "qstring"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // hex
                 regex: "0[xX][0-9a-fA-F]+\\b"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // float
                 regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
             }, {
-                token: "constant",
+                token: "constant", // <CONSTANT>
                 regex: "<[a-zA-Z0-9.]+>"
             }, {
-                token: "keyword",
+                token: "keyword", // pre-compiler directivs
                 regex: "(?:use|include)"
             }, {
                 token: keywordMapper,
@@ -106,7 +106,7 @@ var scadHighlightRules = function () {
         ],
         "comment": [
             {
-                token: "comment",
+                token: "comment", // closing comment
                 regex: "\\*\\/",
                 next: "start"
             }, {