@openui5/sap.ui.codeeditor 1.120.6 → 1.121.0

package/src/sap/ui/codeeditor/js/ace/css/theme/xcode.css

@@ -1,80 +1,106 @@
+/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EE3AD170-2B7F-4DE1-B724-C75F13FE0085) */
 
 .ace-xcode .ace_gutter {
-background: #e8e8e8;
-color: #333
+  background: #e8e8e8;
+  color: #333
 }
+
 .ace-xcode .ace_print-margin {
-width: 1px;
-background: #e8e8e8
+  width: 1px;
+  background: #e8e8e8
 }
+
 .ace-xcode {
-background-color: #FFFFFF;
-color: #000000
+  background-color: #FFFFFF;
+  color: #000000
 }
+
 .ace-xcode .ace_cursor {
-color: #000000
+  color: #000000
 }
+
 .ace-xcode .ace_marker-layer .ace_selection {
-background: #B5D5FF
+  background: #B5D5FF
 }
+
 .ace-xcode.ace_multiselect .ace_selection.ace_start {
-box-shadow: 0 0 3px 0px #FFFFFF;
+  box-shadow: 0 0 3px 0px #FFFFFF;
 }
+
 .ace-xcode .ace_marker-layer .ace_step {
-background: rgb(198, 219, 174)
+  background: rgb(198, 219, 174)
 }
+
 .ace-xcode .ace_marker-layer .ace_bracket {
-margin: -1px 0 0 -1px;
-border: 1px solid #BFBFBF
+  margin: -1px 0 0 -1px;
+  border: 1px solid #BFBFBF
 }
+
 .ace-xcode .ace_marker-layer .ace_active-line {
-background: rgba(0, 0, 0, 0.071)
+  background: rgba(0, 0, 0, 0.071)
 }
+
 .ace-xcode .ace_gutter-active-line {
-background-color: rgba(0, 0, 0, 0.071)
+  background-color: rgba(0, 0, 0, 0.071)
 }
+
 .ace-xcode .ace_marker-layer .ace_selected-word {
-border: 1px solid #B5D5FF
+  border: 1px solid #B5D5FF
 }
+
 .ace-xcode .ace_constant.ace_language,
 .ace-xcode .ace_keyword,
 .ace-xcode .ace_meta,
 .ace-xcode .ace_variable.ace_language {
-color: #C800A4
+  color: #C800A4
 }
+
 .ace-xcode .ace_invisible {
-color: #BFBFBF
+  color: #BFBFBF
 }
+
 .ace-xcode .ace_constant.ace_character,
 .ace-xcode .ace_constant.ace_other {
-color: #275A5E
+  color: #275A5E
 }
+
 .ace-xcode .ace_constant.ace_numeric {
-color: #3A00DC
+  color: #3A00DC
 }
+
 .ace-xcode .ace_entity.ace_other.ace_attribute-name,
 .ace-xcode .ace_support.ace_constant,
 .ace-xcode .ace_support.ace_function {
-color: #450084
+  color: #450084
 }
+
 .ace-xcode .ace_fold {
-background-color: #C800A4;
-border-color: #000000
+  background-color: #C800A4;
+  border-color: #000000
 }
+
 .ace-xcode .ace_entity.ace_name.ace_tag,
 .ace-xcode .ace_support.ace_class,
 .ace-xcode .ace_support.ace_type {
-color: #790EAD
+  color: #790EAD
 }
+
 .ace-xcode .ace_storage {
-color: #C900A4
+  color: #C900A4
 }
+
 .ace-xcode .ace_string {
-color: #DF0002
+  color: #DF0002
 }
+
 .ace-xcode .ace_comment {
-color: #008E00
+  color: #008E00
 }
+
 .ace-xcode .ace_indent-guide {
-background: url("../xcode-1.png") right repeat-y
-}
+  background: url("../xcode-1.png") right repeat-y
+}
+
+.ace-xcode .ace_indent-guide-active {
+  background: url("../xcode-2.png") right repeat-y;
+} 

package/src/sap/ui/codeeditor/js/ace/ext-beautify.js

@@ -1,19 +1,21 @@
-ace.define("ace/ext/beautify",[], function(require, exports, module) {
+ace.define("ace/ext/beautify",["require","exports","module","ace/token_iterator"], function(require, exports, module){// [WIP]
 "use strict";
 var TokenIterator = require("../token_iterator").TokenIterator;
-
 function is(token, type) {
     return token.type.lastIndexOf(type + ".xml") > -1;
 }
 exports.singletonTags = ["area", "base", "br", "col", "command", "embed", "hr", "html", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"];
 exports.blockTags = ["article", "aside", "blockquote", "body", "div", "dl", "fieldset", "footer", "form", "head", "header", "html", "nav", "ol", "p", "script", "section", "style", "table", "tbody", "tfoot", "thead", "ul"];
-
-exports.beautify = function(session) {
+exports.formatOptions = {
+    lineBreaksAfterCommasInCurlyBlock: true
+};
+exports.beautify = function (session) {
     var iterator = new TokenIterator(session, 0, 0);
     var token = iterator.getCurrentToken();
     var tabString = session.getTabString();
     var singletonTags = exports.singletonTags;
     var blockTags = exports.blockTags;
+    var formatOptions = exports.formatOptions || {};
     var nextToken;
     var breakBefore = false;
     var spaceBefore = false;
@@ -38,29 +40,32 @@ exports.beautify = function(session) {
     var inTag = false;
     var inCSS = false;
     var inBlock = false;
-    var levels = {0: 0};
+    var levels = { 0: 0 };
     var parents = [];
     var caseBody = false;
-
-    var trimNext = function() {
+    var trimNext = function () {
         if (nextToken && nextToken.value && nextToken.type !== 'string.regexp')
             nextToken.value = nextToken.value.replace(/^\s*/, "");
     };
-    
-    var trimLine = function() {
-        code = code.replace(/ +$/, "");
+    var trimLine = function () {
+        var end = code.length - 1;
+        while (true) {
+            if (end == 0)
+                break;
+            if (code[end] !== " ")
+                break;
+            end = end - 1;
+        }
+        code = code.slice(0, end + 1);
     };
-
-    var trimCode = function() {
+    var trimCode = function () {
         code = code.trimRight();
         breakBefore = false;
     };
-
     while (token !== null) {
         curRow = iterator.getCurrentTokenRow();
         rowTokens = iterator.$rowTokens;
         nextToken = iterator.stepForward();
-
         if (typeof token !== "undefined") {
             value = token.value;
             unindent = 0;
@@ -72,18 +77,19 @@ exports.beautify = function(session) {
                 if (value === "</") {
                     if (inBlock && !breakBefore && rowsToAdd < 1)
                         rowsToAdd++;
-
                     if (inCSS)
                         rowsToAdd = 1;
-
                     unindent = 1;
                     inBlock = false;
                 }
-            } else if (is(token, "tag-close")) {
+            }
+            else if (is(token, "tag-close")) {
                 inTag = false;
-            } else if (is(token, "comment.start")) {
+            }
+            else if (is(token, "comment.start")) {
                 inBlock = true;
-            } else if (is(token, "comment.end")) {
+            }
+            else if (is(token, "comment.end")) {
                 inBlock = false;
             }
             if (!inTag && !rowsToAdd && token.type === "paren.rparen" && token.value.substr(0, 1) === "}") {
@@ -91,25 +97,20 @@ exports.beautify = function(session) {
             }
             if (curRow !== row) {
                 rowsToAdd = curRow;
-
                 if (row)
                     rowsToAdd -= row;
             }
-
             if (rowsToAdd) {
                 trimCode();
                 for (; rowsToAdd > 0; rowsToAdd--)
                     code += "\n";
-
                 breakBefore = true;
                 if (!is(token, "comment") && !token.type.match(/^(comment|string)$/))
-                   value = value.trimLeft();
+                    value = value.trimLeft();
             }
-
             if (value) {
                 if (token.type === "keyword" && value.match(/^(if|else|elseif|for|foreach|while|switch)$/)) {
                     parents[depth] = value;
-
                     trimNext();
                     spaceAfter = true;
                     if (value.match(/^(else|elseif)$/)) {
@@ -118,13 +119,13 @@ exports.beautify = function(session) {
                             spaceBefore = true;
                         }
                     }
-                } else if (token.type === "paren.lparen") {
+                }
+                else if (token.type === "paren.lparen") {
                     trimNext();
                     if (value.substr(-1) === "{") {
                         spaceAfter = true;
                         indentNextLine = false;
-
-                        if(!inTag)
+                        if (!inTag)
                             rowsToAdd = 1;
                     }
                     if (value.substr(0, 1) === "{") {
@@ -132,25 +133,27 @@ exports.beautify = function(session) {
                         if (code.substr(-1) !== '[' && code.trimRight().substr(-1) === '[') {
                             trimCode();
                             spaceBefore = false;
-                        } else if (code.trimRight().substr(-1) === ')') {
+                        }
+                        else if (code.trimRight().substr(-1) === ')') {
                             trimCode();
-                        } else {
+                        }
+                        else {
                             trimLine();
                         }
                     }
-                } else if (token.type === "paren.rparen") {
+                }
+                else if (token.type === "paren.rparen") {
                     unindent = 1;
                     if (value.substr(0, 1) === "}") {
-                        if (parents[depth-1] === 'case')
+                        if (parents[depth - 1] === 'case')
                             unindent++;
-
                         if (code.trimRight().substr(-1) === '{') {
                             trimCode();
-                        } else {
+                        }
+                        else {
                             spaceBefore = true;
-
                             if (inCSS)
-                                rowsToAdd+=2;
+                                rowsToAdd += 2;
                         }
                     }
                     if (value.substr(0, 1) === "]") {
@@ -167,80 +170,81 @@ exports.beautify = function(session) {
                             trimCode();
                         }
                     }
-
                     trimLine();
-                } else if ((token.type === "keyword.operator" || token.type === "keyword") && value.match(/^(=|==|===|!=|!==|&&|\|\||and|or|xor|\+=|.=|>|>=|<|<=|=>)$/)) {
+                }
+                else if ((token.type === "keyword.operator" || token.type === "keyword") && value.match(/^(=|==|===|!=|!==|&&|\|\||and|or|xor|\+=|.=|>|>=|<|<=|=>)$/)) {
                     trimCode();
                     trimNext();
                     spaceBefore = true;
                     spaceAfter = true;
-                } else if (token.type === "punctuation.operator" && value === ';') {
+                }
+                else if (token.type === "punctuation.operator" && value === ';') {
                     trimCode();
                     trimNext();
                     spaceAfter = true;
-
                     if (inCSS)
                         rowsToAdd++;
-                } else if (token.type === "punctuation.operator" && value.match(/^(:|,)$/)) {
+                }
+                else if (token.type === "punctuation.operator" && value.match(/^(:|,)$/)) {
                     trimCode();
                     trimNext();
-                    if (value.match(/^(,)$/) && curlyDepth>0 && roundDepth===0) {
+                    if (value.match(/^(,)$/) && curlyDepth > 0 && roundDepth === 0 && formatOptions.lineBreaksAfterCommasInCurlyBlock) {
                         rowsToAdd++;
-                    } else {
+                    }
+                    else {
                         spaceAfter = true;
                         breakBefore = false;
                     }
-                } else if (token.type === "support.php_tag" && value === "?>" && !breakBefore) {
+                }
+                else if (token.type === "support.php_tag" && value === "?>" && !breakBefore) {
                     trimCode();
                     spaceBefore = true;
-                } else if (is(token, "attribute-name") && code.substr(-1).match(/^\s$/)) {
+                }
+                else if (is(token, "attribute-name") && code.substr(-1).match(/^\s$/)) {
                     spaceBefore = true;
-                } else if (is(token, "attribute-equals")) {
+                }
+                else if (is(token, "attribute-equals")) {
                     trimLine();
                     trimNext();
-                } else if (is(token, "tag-close")) {
+                }
+                else if (is(token, "tag-close")) {
                     trimLine();
-                    if(value === "/>")
+                    if (value === "/>")
                         spaceBefore = true;
-                } else if (token.type === "keyword" && value.match(/^(case|default)$/)) {
+                }
+                else if (token.type === "keyword" && value.match(/^(case|default)$/)) {
                     if (caseBody)
                         unindent = 1;
                 }
-                if (breakBefore && !(token.type.match(/^(comment)$/) && !value.substr(0, 1).match(/^[/#]$/)) && !(token.type.match(/^(string)$/) && !value.substr(0, 1).match(/^['"]$/))) {
-
+                if (breakBefore && !(token.type.match(/^(comment)$/) && !value.substr(0, 1).match(/^[/#]$/)) && !(token.type.match(/^(string)$/) && !value.substr(0, 1).match(/^['"@]$/))) {
                     indent = lastIndent;
-
-                    if(depth > lastDepth) {
+                    if (depth > lastDepth) {
                         indent++;
-
-                        for (i=depth; i > lastDepth; i--)
+                        for (i = depth; i > lastDepth; i--)
                             levels[i] = indent;
-                    } else if(depth < lastDepth)
+                    }
+                    else if (depth < lastDepth)
                         indent = levels[depth];
-
                     lastDepth = depth;
                     lastIndent = indent;
-
-                    if(unindent)
+                    if (unindent)
                         indent -= unindent;
-
                     if (indentNextLine && !roundDepth) {
                         indent++;
                         indentNextLine = false;
                     }
-
                     for (i = 0; i < indent; i++)
                         code += tabString;
                 }
-
                 if (token.type === "keyword" && value.match(/^(case|default)$/)) {
                     if (caseBody === false) {
                         parents[depth] = value;
                         depth++;
                         caseBody = true;
                     }
-                } else if (token.type === "keyword" && value.match(/^(break)$/)) {
-                    if(parents[depth-1] && parents[depth-1].match(/^(case|default)$/)) {
+                }
+                else if (token.type === "keyword" && value.match(/^(break)$/)) {
+                    if (parents[depth - 1] && parents[depth - 1].match(/^(case|default)$/)) {
                         depth--;
                         caseBody = false;
                     }
@@ -250,25 +254,22 @@ exports.beautify = function(session) {
                     curlyDepth += (value.match(/\{/g) || []).length;
                     depth += value.length;
                 }
-
                 if (token.type === "keyword" && value.match(/^(if|else|elseif|for|while)$/)) {
                     indentNextLine = true;
                     roundDepth = 0;
-                } else if (!roundDepth && value.trim() && token.type !== "comment")
+                }
+                else if (!roundDepth && value.trim() && token.type !== "comment")
                     indentNextLine = false;
-
                 if (token.type === "paren.rparen") {
                     roundDepth -= (value.match(/\)/g) || []).length;
                     curlyDepth -= (value.match(/\}/g) || []).length;
-
                     for (i = 0; i < value.length; i++) {
                         depth--;
-                        if(value.substr(i, 1)==='}' && parents[depth]==='case') {
+                        if (value.substr(i, 1) === '}' && parents[depth] === 'case') {
                             depth--;
                         }
                     }
                 }
-                
                 if (token.type == "text")
                     value = value.replace(/\s+$/, " ");
                 if (spaceBefore && !breakBefore) {
@@ -276,12 +277,9 @@ exports.beautify = function(session) {
                     if (code.substr(-1) !== "\n")
                         code += " ";
                 }
-
                 code += value;
-
                 if (spaceAfter)
                     code += " ";
-
                 breakBefore = false;
                 spaceBefore = false;
                 spaceAfter = false;
@@ -291,35 +289,36 @@ exports.beautify = function(session) {
                     else
                         rowsToAdd = 1;
                 }
-                if (is(token, "tag-open") && value === "</") {
-                    depth--;
-                } else if (is(token, "tag-open") && value === "<" && singletonTags.indexOf(nextToken.value) === -1) {
-                    depth++;
-                } else if (is(token, "tag-name")) {
+                if (nextToken && singletonTags.indexOf(nextToken.value) === -1) {
+                    if (is(token, "tag-open") && value === "</") {
+                        depth--;
+                    }
+                    else if (is(token, "tag-open") && value === "<") {
+                        depth++;
+                    }
+                    else if (is(token, "tag-close") && value === "/>") {
+                        depth--;
+                    }
+                }
+                if (is(token, "tag-name")) {
                     tagName = value;
-                } else if (is(token, "tag-close") && value === "/>" && singletonTags.indexOf(tagName) === -1){
-                    depth--;
                 }
-
                 row = curRow;
             }
         }
-
         token = nextToken;
     }
-
     code = code.trim();
     session.doc.setValue(code);
 };
-
 exports.commands = [{
-    name: "beautify",
-    description: "Format selection (Beautify)",
-    exec: function(editor) {
-        exports.beautify(editor.session);
-    },
-    bindKey: "Ctrl-Shift-B"
-}];
+        name: "beautify",
+        description: "Format selection (Beautify)",
+        exec: function (editor) {
+            exports.beautify(editor.session);
+        },
+        bindKey: "Ctrl-Shift-B"
+    }];
 
 });                (function() {
                     ace.require(["ace/ext/beautify"], function(m) {