deploy: 606b7d0

Author: phoenixide

appConfig.js

@@ -26,7 +26,7 @@ window.AppConfig = {
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-12-07T13:00:48.975Z",
+        "build_timestamp": "2024-12-09T05:42:13.123Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -38,7 +38,7 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "3.11.0-20724",
+    "version": "3.11.0-20725",
     "apiVersion": "3.11.0",
     "homepage": "https://core.ai",
     "issues": {

assets/default-project/en.zip

@@ -33203,44 +33203,6 @@ define("extensionsIntegrated/CSSColorPreview/main", function (require, exports,
         description: Strings.DESCRIPTION_CSS_COLOR_PREVIEW
     });
 
-    /**
-     * Responsible to get all the colors and their respective line numbers.
-     *
-     * @param {Editor} editor
-     * @return {Array.<Object>} an array of objects with all the line nos and,
-     *  the colors to be added on those lines
-     */
-    function _getAllColorsAndLineNums(editor) {
-
-        const nLen = editor.lineCount();
-        const aColors = [];
-
-        // match colors and push into an array
-        for (let i = 0; i < nLen; i++) {
-            let lineText = editor.getLine(i);
-
-            if ((lineText.indexOf('/*') !== -1) || (lineText.indexOf('*/') !== -1)) {
-                continue;
-            } else {
-                let regx = /:[^;]*;/g;
-
-                lineText = lineText.match(regx);
-                if (lineText) {
-                    let tempColors = lineText[0].match(COLOR_REGEX);
-                    // Support up to 4 colors
-                    if (tempColors && tempColors.length > 0) {
-                        let colors = tempColors.slice(0, 4);
-                        aColors.push({
-                            lineNumber: i,
-                            colorValues: colors
-                        });
-                    }
-                }
-            }
-        }
-
-        return aColors;
-    }
 
     /**
      * Gets all the colors that are to be displayed
@@ -33301,15 +33263,21 @@ define("extensionsIntegrated/CSSColorPreview/main", function (require, exports,
 
     /**
      * To display the color marks on the gutter
+     *
      * @param {activeEditor} editor
      * @param {Array.<object>} _results An array of objects which stores
      *   all the line numbers and the colors to be displayed on that line.
+     * @param {Boolean} update marks whether this function is called when some lines
+     *  are updated or when the whole file is re-updated. Defaults to false.
      */
-    function showGutters(editor, _results) {
-        // TODO we should show the gutter in those languages only if a color is present in that file.
+    function showGutters(editor, _results, update = false) {
         if (editor && enabled) {
             const cm = editor._codeMirror;
-            editor.clearGutter(GUTTER_NAME); // clear color markers
+            // if the file is updated we don't need to clear the gutter
+            // as it will clear all the existing markers.
+            if(!update) {
+                editor.clearGutter(GUTTER_NAME); // clear color markers
+            }
             _addDummyGutterMarkerIfNotExist(editor, editor.getCursorPos().line);
 
             // Only add markers if enabled
@@ -33439,11 +33407,134 @@ define("extensionsIntegrated/CSSColorPreview/main", function (require, exports,
         }
     }
 
+    /**
+     * Detects valid colors in a given line of text
+     *
+     * @param {Editor} editor - The editor instance
+     * @param {number} lineNumber - The line number to check
+     * @return {Array<{color: string, index: number}>} An array of valid color values with their indices
+     */
+    function detectValidColorsInLine(editor, lineNumber) {
+        const lineText = editor.getLine(lineNumber);
+
+        // to make sure that code doesn't break when lineText is null.
+        if (!lineText) {
+            return [];
+        }
+
+        const valueRegex = /:[^;]*;/g;
+        const validColors = [];
+
+        // Find all property value sections in the line
+        const lineMatches = [...lineText.matchAll(valueRegex)];
+
+        for (const lineMatch of lineMatches) {
+            // Find colors within each property value
+            const colorMatches = [...lineMatch[0].matchAll(COLOR_REGEX)];
+
+            colorMatches.forEach(colorMatch => {
+                const colorIndex = lineMatch.index + colorMatch.index;
+
+                // Check if the color is within a comment
+                const token = editor.getToken({ line: lineNumber, ch: colorIndex }, true);
+
+                // If the token is not a comment, add the color
+                if (token.type !== "comment") {
+                    validColors.push({
+                        color: colorMatch[0],
+                        index: colorIndex
+                    });
+                }
+            });
+        }
+
+        // Return up to 4 colors
+        return validColors.slice(0, 4).map(item => item.color);
+    }
+
+    /**
+     * Responsible to get all the colors and their respective line numbers.
+     *
+     * @param {Editor} editor
+     * @return {Array.<Object>} an array of objects with all the line nos and,
+     *  the colors to be added on those lines
+     */
+    function _getAllColorsAndLineNums(editor) {
+        const nLen = editor.lineCount();
+        const aColors = [];
+
+        // Match colors and push into an array
+        for (let i = 0; i < nLen; i++) {
+            const colors = detectValidColorsInLine(editor, i);
+
+            // If valid colors found, add to the results
+            if (colors.length > 0) {
+                aColors.push({
+                    lineNumber: i,
+                    colorValues: colors
+                });
+            }
+        }
+
+        return aColors;
+    }
+
+
+    /**
+     * Responsible to update the color marks only on the modified lines
+     *
+     * @param {Editor} editor the editor instance
+     * @param {Number} fromLineNumber modification start from line number
+     * @param {Number} toLineNumber modification upto line number
+     * @return {Array.<Object>} an array of objects with all the line nos and,
+     *  the colors to be added on those lines
+     */
+    function updateColorMarks(editor, fromLineNumber, toLineNumber) {
+        const aColors = [];
+
+        // Match colors and push into an array for modified lines
+        for (let i = fromLineNumber; i <= toLineNumber; i++) {
+            const colors = detectValidColorsInLine(editor, i);
+
+            // If no valid colors, clear the gutter marker
+            if (colors.length === 0) {
+                editor.setGutterMarker(i, GUTTER_NAME, "");
+            } else {
+                aColors.push({
+                    lineNumber: i,
+                    colorValues: colors
+                });
+            }
+        }
+
+        return aColors;
+    }
+
+
     /**
      * Function that gets triggered when any change occurs on the editor
+     *
+     * @param {Editor} instance the codemirror instance
+     * @param {Object} changeObj an object that has properties regarding the line changed and type of change
      */
-    function onChanged() {
-        showColorMarks();
+    function onChanged(instance, changeObj) {
+
+        const editor = EditorManager.getActiveEditor();
+
+        // for insertion and deletion, update the changed lines
+        if(changeObj.origin === '+input' || changeObj.origin === '+delete') {
+            // make sure that the required properties exist and in the form they are expected to be
+            if(changeObj.from.line && changeObj.to.line && changeObj.from.line <= changeObj.to.line) {
+                const aColors = updateColorMarks(editor, changeObj.from.line, changeObj.to.line);
+                showGutters(editor, aColors, true);
+            } else {
+                showColorMarks();
+            }
+
+        } else { // for any complex operation like, cut, paste etc, we re-update the whole file
+            showColorMarks();
+        }
+
     }
 
     // init after appReady

assets/sample-projects/HTML5.zip

@@ -1,6 +1,6 @@
 {
-  "appConfig.js": "d8975dc218ee20ec37934fbf4e196d341396fa20d93635d548cb9e898f50bf48",
-  "assets/default-project/en.zip": "509ed9e86655d8671f67d96880efcf45ca239c13452ace70bf8e6d8996de3acf",
+  "appConfig.js": "1b295d64ffb176b266346781720c0ecff99b359d419730b6c1cdfc14c439aecf",
+  "assets/default-project/en.zip": "17f8198bc36ac16cf656f4175ee147b2196a090d07d314df77edba586aae4ded",
   "assets/default-project/en/images/cloud1.svg": "527399dadfa3357c3ee1a63d6c1c7dda81ecebb832f7383db26f1aaeaf722a8d",
   "assets/default-project/en/images/cloud2.svg": "8127c63c0987bc674e2d25f7d24ead017853326c1e43d07706fec46091904418",
   "assets/default-project/en/images/cloud3.svg": "15de53aa41dea3b0f685292814563f97213a9736c3cec2f8e17b5d9d45b3ae3d",
@@ -125,7 +125,7 @@
   "assets/pwa/32x32.png": "4f8f75bfcdb6efbbed1732f49edab4e292274cdeb1841e285ccc8194f4c9d8ac",
   "assets/pwa/phoenix.png": "d292bf76d6d61fdece2f97fb4cd71b8b0060d1058e9c1d02c94bfb20da8b7f0d",
   "assets/pwa/Square284x284Logo.png": "9887c2967039b4fae1214817925f1fb4f9227cba12d37612457c1c8ee1110c67",
-  "assets/sample-projects/bootstrap-blog.zip": "b33203ee5ed9f99af117e5d27abda973bbefd4c01b59c3a5528cfb6e337e0e4a",
+  "assets/sample-projects/bootstrap-blog.zip": "e96fcd8adac6f088fdf176ed2af59045402bc0bc902b2b22e8a66f09b138ae1d",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
   "assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -135,7 +135,7 @@
   "assets/sample-projects/bootstrap-blog/blog.rtl.css": "33f49d02bbcb2e78f019b7582408fad2b5a76a2ecf79fe09d5b3c08c6ee3872b",
   "assets/sample-projects/bootstrap-blog/index-rtl.html": "c582278884060098ff51b9d350b0739e1a0396debdc76772c62b6ec375b6efcb",
   "assets/sample-projects/bootstrap-blog/index.html": "f4716c2affa299a27ab6f8c74c22fe67564f1b1d36ff2f0b322672bf0479d739",
-  "assets/sample-projects/dashboard.zip": "45ca056d89af21ee7c733a4929b47aed3f7e3a627ea97226063c7c9175e4d5ef",
+  "assets/sample-projects/dashboard.zip": "4a6dc950c69a82a4e9240caffad9e6c7b91c3388f50654b1025bc23eb37a8bcc",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
   "assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -147,7 +147,7 @@
   "assets/sample-projects/dashboard/index.html": "1fb0c934f816d728cad85e180f78369679dc9edb1eca2d5c625b9360e6264235",
   "assets/sample-projects/dashboard/signin.css": "083bef710a6170a5112ce257c2ecf8580ca97ce19136d770f10460e5b85862de",
   "assets/sample-projects/dashboard/signin.html": "8c602e656631aeee624673397c0dc00c339498914ed930ab177478c4662a8d26",
-  "assets/sample-projects/explore.zip": "7028039987360cdf8ab1140bf9085ce7e93d03e7659f51318e7771577744729e",
+  "assets/sample-projects/explore.zip": "23771f45dd593100acb03316a658011bc99f96bcf5a4464e7ace9b8e211b4529",
   "assets/sample-projects/explore/A-tribute-page.html": "bd510c60f444058b7fcb71d83841f32b1cb5193c1a39421d7739bd6af9fef248",
   "assets/sample-projects/explore/adjustable-fireworks.html": "11e69bb2dd8708ed8fbf1acc62b0aaaf88c7ffec859ee958dc1ae51cd53ddac8",
   "assets/sample-projects/explore/ant_colony.html": "bc9435ed1b9868f2fbc7212d526f7532c533a5fdf45da988fa5e575bc5f363b7",
@@ -236,7 +236,7 @@
   "assets/sample-projects/explore/watermelon-pixel.html": "765a3fbffb5db97910512fbabaa7c55c0b52dc8eedfcc630811be39d0af98663",
   "assets/sample-projects/explore/webmine.html": "6b808f52812dc03db28483411500c04daf8ee0226f535c600a36999d6b7837c0",
   "assets/sample-projects/explore/whack-a-mole.html": "25be94a3640553b4801f80edd49998bae3a360988e8a26ff3bdfdc2a76b77191",
-  "assets/sample-projects/home-pages.zip": "9fa2bb0a579d6dfe4bbedf600dc9f63f8a76db50da94feeb1591be506c74da3c",
+  "assets/sample-projects/home-pages.zip": "c2e5db8da261ecd45e25d085637dba96a1969770c6be69bf6c6ae67a4d6347b3",
   "assets/sample-projects/home-pages/album/index.html": "e29a1e96644bc17bab1a7e3724e822d65a479e10df182725ee1afa916efbfdc1",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
@@ -248,19 +248,19 @@
   "assets/sample-projects/home-pages/carousel/index.html": "235d650043a09f2954f24e4659f64d99ef3988858567fb2221fb1cf34df057e6",
   "assets/sample-projects/home-pages/cover/cover.css": "2fbb596077c570cad7ee9e98fb88f5665e0ecfc11e7085c3e04639ad03f7bc10",
   "assets/sample-projects/home-pages/cover/index.html": "759214701ff759432711b3421d80aca692c7a2b4c978c516a0bcd0c81a43f381",
-  "assets/sample-projects/HTML5.zip": "d10eb2983ab50405a37b1bdb3e31c431b32e6fe7bb70424046d4ce21580b77b7",
+  "assets/sample-projects/HTML5.zip": "bb29ee0038fe7c98d125efc69d347cc31eecd424d9cfc8c7eab739469ce2db4b",
   "assets/sample-projects/HTML5/index.html": "2dc94c7d3e33aeeb44ec4f75bc7df86a5fd19f3121f2fd3638636fbf7c476c6a",
   "assets/sample-projects/HTML5/script.js": "c49e4b01cded4defbc21f5d5d0102719ce4cccbe1b9cb19f9232c5a05df658da",
   "assets/sample-projects/HTML5/styles.css": "744b85a9c31affbb00976694c4b9c9149b31e575ed9efdec386231d062ae93f2",
   "assets/sample-projects/new-project-list.json": "be1c907279163610779b000aa9ea6e4b035e07429203f16445a914c7045f2d64",
   "assets/sample-projects/zips/bootstrap.zip": "6f10407c00ce5d598e77f890528743dc645bc28014335483992b481e63fd7b97",
   "base-config/keyboard.json": "f3380c609a293a95644965958286b31863d733293824d56b7087fa0ce4c2d618",
   "base-config/readme-keyboard.md": "27e98128176dbd060e93b1f321a4ddcd609571b7b8eb8c9112588f4767d08a03",
-  "brackets-min.js": "078c0e4dadb82103955ed49140266fa119df1e87780ca55dc700fcfc2b3cb080",
+  "brackets-min.js": "530dd5b92b789dd1e269b3096cf875f5461d8518cb3c786f8b4a7e5488102897",
   "brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
   "brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
   "brackets.js": "f7a3164510e76e012591c9758acb47f2445526642503180c57209d30faa24d69",
-  "cacheManifest.json": "92d023077753ba32b0dc4e63970726d856e01446ce9d0f3a11343331af4fdbde",
+  "cacheManifest.json": "7658171ac5a3a5dd2403c3920d6f649d6b711081e6cd6e8f032b57ba5864b78b",
   "command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
   "command/CommandManager.js": "10181902fc2e55a780981a17b95c7b579427fdfd12c92ed49df35d3b70f64c15",
   "command/Commands.js": "1865297506325887a66cf11113c5cef905676fdc4b594b707bee381d968f15b0",
@@ -269,7 +269,7 @@
   "command/KeyboardOverlayMode.js": "7170dfcfca59b41252146ef8a5ca4f652c666e33b7a4b411e30e72951bd35b49",
   "command/Keys.js": "36545bbbca56d2a909779c5873fa860bf737977588ad61a398acb86f6bcbe4ee",
   "command/Menus.js": "b0c5031f13e4ca6efd594e9fcb973f0e591a1af6cc0c0df8ec32024f6bdd0f08",
-  "config.json": "e6bfd25cdc31350ac68d6d51d1a43cc66df8a22fe196e0de4a79c76d22229e80",
+  "config.json": "793d7e9433f25b540de637b52990d9d24df9cd6ca0603d09bf236b1273b68db3",
   "desktop-metrics.html": "66f87550ddf04f284a6c1e81567b7dfbefb2b8007f48f0bad7d8f7aacdb11bac",
   "devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
   "document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -516,9 +516,9 @@
   "extensions/default/UrlCodeHints/requirejs-config.json": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a",
   "extensions/default/UrlCodeHints/unittests.js": "c60ecbe81555d435437dc5b7294f4e89b3befb7b34d60c44285c6009807c29c2",
   "extensions/dev/README.md": "3fd897e55e0e05e503c898555cfa3b20e820b32946fc7c426ea9bb2afbed449f",
-  "extensions/registry/popularity.json": "f57fae9af72dc3af17dda65ae576bc70c361adcb5f7faf771a887ebcd98abad0",
+  "extensions/registry/popularity.json": "b0bc5af553d6c6b10e046f44080973f35ffd846f6f6b67bcf1e22f277a2e24e0",
   "extensions/registry/registry_version.json": "8b37ddfc93aade27f06d02ca6b539106109bd04442a105c5d03c8a3d6775f48d",
-  "extensions/registry/registry.json": "4f0842009a0d2429726b1fd5f614d7c560f2c5c2c235f0f5e12dcc3cd753e79a",
+  "extensions/registry/registry.json": "525aaf32f3f47307bf409de66f0e57fb93875a06f8b59d2d6ff34bb71f549119",
   "extensions/samples/BracketsConfigCentral/htmlContent/Config.html": "6ac3ce03e2fb8913ec5da3e8835c0646894f242600c64d95b77c7d7dc0a156f7",
   "extensions/samples/BracketsConfigCentral/htmlContent/logo-sm.png": "006f025fecd24c292e87a1eb0e123ee21178ec9c09517a1f16fe362fe2fbcbb5",
   "extensions/samples/BracketsConfigCentral/main.js": "f2c36decadb7d98e2a89cfdb9aff8a74cc130ea8c3ad084b7af62ee21e3a8181",
@@ -542,7 +542,7 @@
   "extensions/samples/README.md": "381c6647cc6f90bd8c609b5896cfcdf78bcae2b3a9660c204d8b744a21436df6",
   "extensions/samples/TypingSpeedLogger/main.js": "87327584d6ebaa4e69ee7a8b4972951baeb01869f22b7c971736524cecd3137f",
   "extensionsIntegrated/appUpdater/main.js": "1d0c06f3bfb951d6293e0a69ea10def6d4f3addec459e8df78f3c88ea0a26fb6",
-  "extensionsIntegrated/CSSColorPreview/main.js": "b55d2d5826b1af1a12dd1aef1ddc5865d3a9c6d6f768f1b065e0daf69ea115d4",
+  "extensionsIntegrated/CSSColorPreview/main.js": "16247105784a4b392bbf003d5735aece69d51e57b93e640d6a3f0c50712cf815",
   "extensionsIntegrated/DisplayShortcuts/main.js": "1f03c6526af816a730f4a72d596a8b3db7294de8c8c26756e331aa442b0e91a6",
   "extensionsIntegrated/DisplayShortcuts/package.json": "385efa285cafdd7695557c66ac1d7a925aab824362a2a8f6e60dbf195d3239dd",
   "extensionsIntegrated/DisplayShortcuts/templates/bottom-panel.html": "1687fe6eb9d71c808d34745a7c68b235d1aa8c948339a17ce0d98aa8654fd280",

assets/sample-projects/bootstrap-blog.zip

@@ -25,7 +25,7 @@
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-12-07T13:00:48.975Z",
+        "build_timestamp": "2024-12-09T05:42:13.123Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -37,7 +37,7 @@
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "3.11.0-20724",
+    "version": "3.11.0-20725",
     "apiVersion": "3.11.0",
     "homepage": "https://core.ai",
     "issues": {