- ambiance and chrome themes design like DARK and LIGHT lsfusion themes

 - removed css folder

Author: alex-byi

Makefile.dryice.js

@@ -436,113 +436,6 @@ function buildAce(options, callback) {
             sanityCheck(options, callback);
         if (options.noconflict && !options.compress)
             buildTypes();
-
-        extractCss(options, function() {
-            if (callback)
-                return callback();
-            console.log("Finished building " + getTargetDir(options));
-
-        });
-    }
-}
-
-function extractCss(options, callback) {
-    var dir = BUILD_DIR + "/src" + (options.noconflict ? "-noconflict" : "");
-    var filenames = fs.readdirSync(dir);
-    var css = "";
-    var images = {};
-    var usedCss = {};
-    filenames.forEach(function(filename) {
-        var stat = fs.statSync(dir + "/" + filename);
-        if (stat.isDirectory()) return;
-        var value = fs.readFileSync(dir + "/" + filename, "utf8");
-
-        var cssImports = detectCssImports(value);
-
-        if (/theme-/.test(filename)) {
-            var name = filename.replace(/^theme-|\.js$/g, "");
-            var themeCss = "";
-            for (var i in cssImports) {
-                themeCss += cssImports[i];
-            }
-            themeCss = extractImages(themeCss, name, "..");
-            build.writeToFile({code: themeCss}, {
-                outputFolder: BUILD_DIR + "/css/theme",
-                outputFile: name + ".css"
-            }, function() {});
-        } else if (cssImports) {
-            css += "\n/*" + filename + "*/";
-            for (var i in cssImports) {
-                if (usedCss[cssImports[i]]) continue;
-                usedCss[cssImports[i]] = true;
-                css += "\n" + cssImports[i];
-            }
-        }
-    });
-
-    css = extractImages(css, "main", ".").replace(/^\s*/gm, "");
-    build.writeToFile({code: css}, {
-        outputFolder: BUILD_DIR + "/css",
-        outputFile: "ace.css"
-    }, function() {
-        saveImages();
-        callback();
-    });
-
-    function detectCssImports(code) {
-        code = code.replace(/^\s*\/\/.+|^\s*\/\*[\s\S]*?\*\//gm, "");
-
-        var stringRegex = /^("(?:[^"\\]|\\[\d\D])*"|'(?:[^'\\]|\\[\d\D])*'|)/;
-        var importCssRegex = /\.importCssString\(\s*(?:([^,)"']+)|["'])/g;
-
-        var match;
-        var cssImports;
-        while (match = importCssRegex.exec(code)) {
-            if (match[1]) {
-                var locationRegex = new RegExp("[^.]" + match[1] + /\s*=\s*['"]/.source);
-                match = locationRegex.exec(code);
-                if (!match) continue;
-            }
-            var index = match.index + match[0].length - 1;
-            if (cssImports && cssImports[index]) continue;
-            var cssString = stringRegex.exec(code.slice(index))[0];
-            if (!cssString) continue;
-            if (!cssImports) cssImports = {};
-            cssImports[index] = cssString.slice(1, -1).replace(/\\(.|\n)/g, function(_, ch) {
-                if (ch == "n") return "";
-                return ch;
-            });
-        }
-        return cssImports;
-    }
-
-    function extractImages(css, name, directory) {
-        var imageCounter = 0;
-        return css.replace(
-            /url\(\s*"data:([^"\\]|\\.)+"\s*\)|url\(\s*'data:([^'\\]|\\.)+'\s*\)|url\(data:[^)]+\)/g,
-            function(url) {
-                var data = url.slice(4, -1).trim();
-                if (/["']/.test(data[0])) {
-                    data = data.slice(1, -1).replace(/\\(.)/g, "$1");
-                }
-                data = data.slice(5);
-                var i = data.indexOf(",");
-                if (i == -1) {
-                    console.error(url);
-                    return url;
-                }
-                var buffer = Buffer.from(data.slice(i + 1), "base64");
-                imageCounter++;
-                var imageName = name + "-" + imageCounter + ".png";
-                images[imageName] = buffer;
-                return "url(\"" + directory + "/" + imageName + "\")";
-            }
-        );
-    }
-    function saveImages() {
-        for (var imageName in images) {
-            fs.writeFileSync(BUILD_DIR + "/css/" + imageName, images[imageName]);
-        }
     }
 }
 

lib/ace/css/editor.css

@@ -83,7 +83,6 @@ styles.join("\n")
     bottom: 0;
     left: 0;
     cursor: default;
-    z-index: 4;
     -ms-user-select: none;
     -moz-user-select: none;
     -webkit-user-select: none;
@@ -395,12 +394,13 @@ styles.join("\n")
 }
 
 .ace_tooltip {
+    background: var(--background-color);
+    color: var(--text-color);
     background-color: #FFF;
     background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));
     border: 1px solid gray;
     border-radius: 1px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-    color: black;
     max-width: 100%;
     padding: 3px 4px;
     position: fixed;

lib/ace/mode/lsf.js

@@ -163,15 +163,14 @@ define(function (require, exports, module) {
                     token: "comment",
                     regex: "\\/\\/.*$"
                 },
+                {
+                    token : "string",
+                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+                },
                 {
                     token: keywordMapper,
                     regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
                 }
-            ],
-            "comment": [
-                {
-                    defaultToken: "comment"
-                }
             ]
         };
     };
@@ -183,6 +182,7 @@ define(function (require, exports, module) {
     oop.inherits(Mode, TextMode);
 
     (function () {
+        this.lineCommentStart = "//"; // this is need to "ctrl + /" hotkey worked correctly
         this.$id = "ace/mode/lsf";
 
         var WorkerClient = require("../worker/worker_client").WorkerClient;

lib/ace/theme/ambiance.css

@@ -10,8 +10,8 @@
 }
 
 .ace-chrome {
-  background-color: #FFFFFF;
-  color: black;
+  background: var(--component-background-color);
+  color: var(--text-color);
 }
 
 .ace-chrome .ace_cursor {
@@ -61,19 +61,19 @@
   color:#FD971F;
 }
 .ace-chrome .ace_keyword.ace_operator {
-  color: rgb(104, 118, 135);
+  color: #000080;
 }
 
 .ace-chrome .ace_comment {
-  color: #236e24;
+  color: #808080;
 }
 
 .ace-chrome .ace_comment.ace_doc {
-  color: #236e24;
+  color: #808080;
 }
 
 .ace-chrome .ace_comment.ace_doc.ace_tag {
-  color: #236e24;
+  color: #808080;
 }
 
 .ace-chrome .ace_constant.ace_numeric {
@@ -134,15 +134,15 @@
 .ace-chrome .ace_storage,
 .ace-chrome .ace_keyword,
 .ace-chrome .ace_meta.ace_tag {
-  color: rgb(147, 15, 128);
+  color: #000080;
 }
 
 .ace-chrome .ace_string.ace_regex {
-  color: rgb(255, 0, 0)
+  color: #008000;
 }
 
 .ace-chrome .ace_string {
-  color: #1A1AA6;
+  color: #008000;
 }
 
 .ace-chrome .ace_entity.ace_other.ace_attribute-name {