@openui5/sap.ui.codeeditor 1.133.1 → 1.135.0

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

@@ -178,11 +178,10 @@ exports.XmlHighlightRules = XmlHighlightRules;
 
 });
 
-ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(require, exports, module){"use strict";
+ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator"], function(require, exports, module){"use strict";
 var oop = require("../../lib/oop");
 var Behaviour = require("../behaviour").Behaviour;
 var TokenIterator = require("../../token_iterator").TokenIterator;
-var lang = require("../../lib/lang");
 function is(token, type) {
     return token && token.type.lastIndexOf(type + ".xml") > -1;
 }
@@ -271,7 +270,7 @@ var XmlBehaviour = function () {
             var element = token.value;
             if (tokenRow == position.row)
                 element = element.substring(0, position.column - tokenColumn);
-            if (this.voidElements.hasOwnProperty(element.toLowerCase()))
+            if (this.voidElements && this.voidElements.hasOwnProperty(element.toLowerCase()))
                 return;
             return {
                 text: ">" + "</" + element + ">",
@@ -285,7 +284,7 @@ var XmlBehaviour = function () {
             var line = session.getLine(cursor.row);
             var iterator = new TokenIterator(session, cursor.row, cursor.column);
             var token = iterator.getCurrentToken();
-            if (token && token.type.indexOf("tag-close") !== -1) {
+            if (is(token, "") && token.type.indexOf("tag-close") !== -1) {
                 if (token.value == "/>")
                     return;
                 while (token && token.type.indexOf("tag-name") === -1) {
@@ -300,7 +299,7 @@ var XmlBehaviour = function () {
                 if (!token || token.type.indexOf("end-tag") !== -1) {
                     return;
                 }
-                if (this.voidElements && !this.voidElements[tag]) {
+                if (this.voidElements && !this.voidElements[tag] || !this.voidElements) {
                     var nextToken = session.getTokenAt(cursor.row, cursor.column + 1);
                     var line = session.getLine(row);
                     var nextIndent = this.$getIndent(line);
@@ -378,6 +377,12 @@ function is(token, type) {
                 if (!token)
                     return null;
                 tag.tagName = token.value;
+                if (token.value === "") { //skip empty tag name token for fragment
+                    token = tokens[++i];
+                    if (!token)
+                        return null;
+                    tag.tagName = token.value;
+                }
                 tag.end.column += token.value.length;
                 for (i++; i < tokens.length; i++) {
                     token = tokens[i];
@@ -403,10 +408,13 @@ function is(token, type) {
         for (var i = 0; i < tokens.length; i++) {
             var token = tokens[i];
             column += token.value.length;
-            if (column < startColumn)
+            if (column < startColumn - 1)
                 continue;
             if (is(token, "end-tag-open")) {
                 token = tokens[i + 1];
+                if (is(token, "tag-name") && token.value === "") {
+                    token = tokens[i + 2];
+                }
                 if (token && token.value == tagName)
                     return true;
             }
@@ -414,14 +422,14 @@ function is(token, type) {
         return false;
     };
     this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        if (!firstTag) {
+            return this.getCommentFoldWidget(session, row) && session.getCommentFoldRange(row, session.getLine(row).length);
+        }
         var tags = session.getMatchingTags({ row: row, column: 0 });
         if (tags) {
             return new Range(tags.openTag.end.row, tags.openTag.end.column, tags.closeTag.start.row, tags.closeTag.start.column);
         }
-        else {
-            return this.getCommentFoldWidget(session, row)
-                && session.getCommentFoldRange(row, session.getLine(row).length);
-        }
     };
 }).call(FoldMode.prototype);
 

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

@@ -2084,11 +2084,10 @@ exports.XQueryLexer = function(){ return new Lexer(XQueryTokenizer, Rules); };
 
 });
 
-ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(require, exports, module){"use strict";
+ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator"], function(require, exports, module){"use strict";
 var oop = require("../../lib/oop");
 var Behaviour = require("../behaviour").Behaviour;
 var TokenIterator = require("../../token_iterator").TokenIterator;
-var lang = require("../../lib/lang");
 function is(token, type) {
     return token && token.type.lastIndexOf(type + ".xml") > -1;
 }
@@ -2177,7 +2176,7 @@ var XmlBehaviour = function () {
             var element = token.value;
             if (tokenRow == position.row)
                 element = element.substring(0, position.column - tokenColumn);
-            if (this.voidElements.hasOwnProperty(element.toLowerCase()))
+            if (this.voidElements && this.voidElements.hasOwnProperty(element.toLowerCase()))
                 return;
             return {
                 text: ">" + "</" + element + ">",
@@ -2191,7 +2190,7 @@ var XmlBehaviour = function () {
             var line = session.getLine(cursor.row);
             var iterator = new TokenIterator(session, cursor.row, cursor.column);
             var token = iterator.getCurrentToken();
-            if (token && token.type.indexOf("tag-close") !== -1) {
+            if (is(token, "") && token.type.indexOf("tag-close") !== -1) {
                 if (token.value == "/>")
                     return;
                 while (token && token.type.indexOf("tag-name") === -1) {
@@ -2206,7 +2205,7 @@ var XmlBehaviour = function () {
                 if (!token || token.type.indexOf("end-tag") !== -1) {
                     return;
                 }
-                if (this.voidElements && !this.voidElements[tag]) {
+                if (this.voidElements && !this.voidElements[tag] || !this.voidElements) {
                     var nextToken = session.getTokenAt(cursor.row, cursor.column + 1);
                     var line = session.getLine(row);
                     var nextIndent = this.$getIndent(line);

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

@@ -32,10 +32,10 @@ var YamlHighlightRules = function () {
                 token: "keyword.operator",
                 regex: "-\\s*(?=[{])"
             }, {
-                token: "string",
+                token: "string", // single line
                 regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
             }, {
-                token: "string",
+                token: "string", // multi line string start
                 regex: /[|>][-+\d]*(?:$|\s+(?:$|#))/,
                 onMatch: function (val, state, stack, line) {
                     line = line.replace(/ #.*/, "");
@@ -61,13 +61,13 @@ var YamlHighlightRules = function () {
                 },
                 next: "mlString"
             }, {
-                token: "string",
+                token: "string", // single quoted string
                 regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // float
                 regex: /(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)$/
             }, {
-                token: "constant.numeric",
+                token: "constant.numeric", // other number
                 regex: /[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/
             }, {
                 token: "constant.language.boolean",

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

@@ -309,7 +309,7 @@ var ZeekHighlightRules = function () {
                 token: "punctuation.section.parens.end",
                 regex: /\)/
             }
-        ],
+        ], // state: start
         "string-state": [
             {
                 token: "constant.character.escape",
@@ -328,7 +328,7 @@ var ZeekHighlightRules = function () {
                 token: "string.double",
                 regex: "."
             }
-        ],
+        ], // state: string-state
         "pattern-state": [
             {
                 token: "constant.character.escape",