deploy: 606b7d0

Author: phoenixide

appConfig.js

@@ -27,7 +27,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": "2025-02-17T10:32:24.621Z",
+        "build_timestamp": "2025-02-18T03:49:50.002Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -39,7 +39,7 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "4.1.0-20895",
+    "version": "4.1.0-20896",
     "apiVersion": "4.1.0",
     "homepage": "https://core.ai",
     "issues": {

assets/default-project/en.zip

@@ -1,6 +1,6 @@
 {
-  "appConfig.js": "f86ecd20de53586d405084bf2e36f8ebeda525af89aad6856c3555b81347b73b",
-  "assets/default-project/en.zip": "b67ecf51b6ce8ec9ca345584f84956c744642277b3f660f021817705e64bbb99",
+  "appConfig.js": "60011c514e0dc31fac8b0b1802c26fd5f2da92c07e36abbdc47a27f4fc40c01b",
+  "assets/default-project/en.zip": "cbf3800f86db72bda9d4df537686ed887532987aecb9990613c7ab55a2f87c58",
   "assets/default-project/en/images/cloud1.svg": "527399dadfa3357c3ee1a63d6c1c7dda81ecebb832f7383db26f1aaeaf722a8d",
   "assets/default-project/en/images/cloud2.svg": "8127c63c0987bc674e2d25f7d24ead017853326c1e43d07706fec46091904418",
   "assets/default-project/en/images/cloud3.svg": "15de53aa41dea3b0f685292814563f97213a9736c3cec2f8e17b5d9d45b3ae3d",
@@ -126,7 +126,7 @@
   "assets/pwa/32x32.png": "4f8f75bfcdb6efbbed1732f49edab4e292274cdeb1841e285ccc8194f4c9d8ac",
   "assets/pwa/phoenix.png": "d292bf76d6d61fdece2f97fb4cd71b8b0060d1058e9c1d02c94bfb20da8b7f0d",
   "assets/pwa/Square284x284Logo.png": "9887c2967039b4fae1214817925f1fb4f9227cba12d37612457c1c8ee1110c67",
-  "assets/sample-projects/bootstrap-blog.zip": "0eef3258a63b2fc5bdd664d4d29c2bf84fafb93f6811d6ac1bb07e42d89cff40",
+  "assets/sample-projects/bootstrap-blog.zip": "1cedde36e4d8a2e10d894e9e7d28dd46f794b6d5ed20596ca9e14cab438962c0",
   "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",
@@ -136,7 +136,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": "4ed60bb95e5a3183b25b2eb24554b7c96eeb235cb647d04224081b7180a759ca",
+  "assets/sample-projects/dashboard.zip": "bf85bc2bbef6d2494cdc9efde7a70d7ea9ef2f24e9ba043ac0cf27e81d218ead",
   "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",
@@ -148,7 +148,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": "b78d835c45300deb02fab00a5922c1b263d31f7da8a05b7e593f3160b6b118ab",
+  "assets/sample-projects/explore.zip": "a15f5e4a14bb9917ae96fa485e8b25e8885327ffd55efcdbea7594c68df4621c",
   "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",
@@ -237,7 +237,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": "e526d189f6f28a907ac6e05fcefb559d62fdac5cbd673753295cfa0e08e596e6",
+  "assets/sample-projects/home-pages.zip": "889ed77bd4c2ce667ebdffc2b0544f2d8ce21cd442b526cee1d4e221bf77c3f7",
   "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",
@@ -249,7 +249,7 @@
   "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": "6d6df8227209c0205aa3c00036dd0eff0809924641abaf973ba9c50d0b5809dd",
+  "assets/sample-projects/HTML5.zip": "ae3ae7c9656c72107252e409acbe3c8fd58071983996c6ac511bd3433013a353",
   "assets/sample-projects/HTML5/index.html": "2dc94c7d3e33aeeb44ec4f75bc7df86a5fd19f3121f2fd3638636fbf7c476c6a",
   "assets/sample-projects/HTML5/script.js": "c49e4b01cded4defbc21f5d5d0102719ce4cccbe1b9cb19f9232c5a05df658da",
   "assets/sample-projects/HTML5/styles.css": "744b85a9c31affbb00976694c4b9c9149b31e575ed9efdec386231d062ae93f2",
@@ -261,7 +261,7 @@
   "brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
   "brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
   "brackets.js": "6dee2717d91f84c60a3afa8e6427a96fbcdba0363fbcd0a8d8baea74f13f20bc",
-  "cacheManifest.json": "4c8f70444bc434c5f1e491f7c13fd674e739be3dfff1947a96c3659c112fea50",
+  "cacheManifest.json": "c150127ff17f57d77c98dc63da34869aefa5c1288fdb5bf142bb7fcb3ea044e5",
   "command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
   "command/CommandManager.js": "10181902fc2e55a780981a17b95c7b579427fdfd12c92ed49df35d3b70f64c15",
   "command/Commands.js": "3a1c725760f0ecddf4d6796d710cc61443d1a9a48f0c36ee1a98d22d2cf8326f",
@@ -270,7 +270,7 @@
   "command/KeyboardOverlayMode.js": "7170dfcfca59b41252146ef8a5ca4f652c666e33b7a4b411e30e72951bd35b49",
   "command/Keys.js": "36545bbbca56d2a909779c5873fa860bf737977588ad61a398acb86f6bcbe4ee",
   "command/Menus.js": "8f45da169c25f227364a4a2f3d6b2080ed4e333fc9d2ec5fa0ab737d0a075d3a",
-  "config.json": "5b0cd750ab6b5cb1c113a9a9eaa0a7109eddfeba510f46093739b77d2cf218ab",
+  "config.json": "373116a9f6e4953ef96c83171d14a1d7bf5c0bbf46b3ce71f7c57944642ea538",
   "desktop-metrics.html": "66f87550ddf04f284a6c1e81567b7dfbefb2b8007f48f0bad7d8f7aacdb11bac",
   "devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
   "document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -359,7 +359,7 @@
   "extensions/default/DebugCommands/testBuilder.js": "c5d3ac480fa95c2bb8aec12e194b564c2b04564527e951a93a880918f65e86f8",
   "extensions/default/DebugCommands/unittests.js": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
   "extensions/default/DefaultExtensions.json": "44c73e9c25d569c3e1374bacfafea5f8d6e854de83f3f6824093f96c0eef0ce2",
-  "extensions/default/Git/main.js": "f51ac03d3f65072ccb394b836f3f3e8de094c3ff16dc90a1150f676b15800749",
+  "extensions/default/Git/main.js": "d5e8664a958b28061222901d8530b3dc14fe347e9e8d061022ae0f8ade00390b",
   "extensions/default/Git/package.json": "702cf1150cd442e1c3046d6882f7e2d3e7dbf18d62c821258538cfff2cad6cfc",
   "extensions/default/Git/requirejs-config.json": "ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356",
   "extensions/default/Git/src/BracketsEvents.js": "7f7dcfe39bb589f4decdab52d98e220223830e3cf85b6b2e68dc5140db9cc3d1",
@@ -383,7 +383,7 @@
   "extensions/default/Git/src/ExpectedError.js": "97475e685bf0df958f9f2e4fffbc27aa4e8528288cdac6b8fb20b1ad6eb05027",
   "extensions/default/Git/src/git/Git.js": "3783bf1801c5714a964d414230c86d0fb1fa3a2bf10185fbc1ab1bc51b73ff08",
   "extensions/default/Git/src/git/GitCli.js": "3cfe021c721f536d436a025c7005cea55ce5fa6188a8ad4955e979469fd443a4",
-  "extensions/default/Git/src/GutterManager.js": "e605ef663239516abd2022a02918d93d07635697227f9988824c2c266de955e6",
+  "extensions/default/Git/src/GutterManager.js": "5873ea1a0fa1bb0a6de5ab5c45364306a7fac5115cb8f1dd3e99fa652604fa8b",
   "extensions/default/Git/src/History.js": "54b7dae78922717e14da05edb27256bbaf3c726a6eb64d5be17ccda888fc7b9b",
   "extensions/default/Git/src/HistoryViewer.js": "dd92c46ecddd0aceeeee3f2c16356d6c24c7aa6260a6d5e90f187f10e38cf513",
   "extensions/default/Git/src/Main.js": "e47b0e16165893e7f9204c34eea9607a1821765b633fbdee5463fe50ed020e31",
@@ -396,8 +396,8 @@
   "extensions/default/Git/src/Utils.js": "285a21fb640020fb36f5bf76bc5ee4cb51ef2904fd1db906a4983f8a10675ab5",
   "extensions/default/Git/src/utils/Setup.js": "c40cfdffeec55f0346c0ffe7a7f9c849f0c44bdb32bcedd4174900c87d816319",
   "extensions/default/Git/styles/git-icon.svg": "b4a174e8cf164558a8908041a165b0a759e0e63c583a4a0d5cfd0f68db6f19a7",
-  "extensions/default/Git/styles/git-styles-min.css": "e9ba397612d04babefca71bd064372e3919783038d309efa6829bdca638b7f6b",
-  "extensions/default/Git/styles/git-styles.less": "b6e5e6f44b7d28b50ff296b8a5db7d372058e94221d277e687b0ff6855ad0b23",
+  "extensions/default/Git/styles/git-styles-min.css": "8918437010e0399ca7ad8995b5b26053f93d7f468ca3a77b931bb20f9795fbc2",
+  "extensions/default/Git/styles/git-styles.less": "42730d2f2e4e30dec36746136bbeee30c3588ee8ddfffcfa4a82f422a31280dc",
   "extensions/default/Git/templates/authors-dialog.html": "c11d84328387a28883ab36f96e022480e15b1b42dc751ff9b7c78de52c5d72a7",
   "extensions/default/Git/templates/branch-merge-dialog.html": "8edac6d19912f89d0e4239a7b922cab5c6a275edba107842448aa8a947f234c8",
   "extensions/default/Git/templates/branch-new-dialog.html": "c3747672be709a80aea7ae6ec5852993ff1b982bcd687f7995580a15ec27c75b",
@@ -576,7 +576,7 @@
   "extensions/default/UrlCodeHints/requirejs-config.json": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a",
   "extensions/default/UrlCodeHints/unittests.js": "c60ecbe81555d435437dc5b7294f4e89b3befb7b34d60c44285c6009807c29c2",
   "extensions/dev/README.md": "3fd897e55e0e05e503c898555cfa3b20e820b32946fc7c426ea9bb2afbed449f",
-  "extensions/registry/popularity.json": "abe5ec1b6b6081a9ffab347a4e4c4cdeb99560b02117c98200225bdcf855f2d0",
+  "extensions/registry/popularity.json": "42e252cc619c9f2e85a42bd68d5b86de35ef18f1e7a04e70529f35efcde93396",
   "extensions/registry/registry_version.json": "4ff4f7dd8c35cd0c4e7bbd041692abbb2a943c70ffad015b6296a5690b8b6c8c",
   "extensions/samples/BracketsConfigCentral/htmlContent/Config.html": "6ac3ce03e2fb8913ec5da3e8835c0646894f242600c64d95b77c7d7dc0a156f7",
   "extensions/samples/BracketsConfigCentral/htmlContent/logo-sm.png": "006f025fecd24c292e87a1eb0e123ee21178ec9c09517a1f16fe362fe2fbcbb5",

assets/sample-projects/HTML5.zip

@@ -26,7 +26,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": "2025-02-17T10:32:24.621Z",
+        "build_timestamp": "2025-02-18T03:49:50.002Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -38,7 +38,7 @@
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "4.1.0-20895",
+    "version": "4.1.0-20896",
     "apiVersion": "4.1.0",
     "homepage": "https://core.ai",
     "issues": {

assets/sample-projects/bootstrap-blog.zip

@@ -1421,6 +1421,7 @@ define("src/GutterManager", function (require, exports) {
         CommandManager  = brackets.getModule("command/CommandManager"),
         DocumentManager = brackets.getModule("document/DocumentManager"),
         EditorManager   = brackets.getModule("editor/EditorManager"),
+        ScrollTrackMarkers  = brackets.getModule("search/ScrollTrackMarkers"),
         MainViewManager = brackets.getModule("view/MainViewManager"),
         ErrorHandler    = require("src/ErrorHandler"),
         Events          = require("src/Events"),
@@ -1429,6 +1430,8 @@ define("src/GutterManager", function (require, exports) {
         Preferences     = require("./Preferences"),
         Strings             = brackets.getModule("strings");
 
+    const GIT_SCROLL_MARKS = "git_marks";
+
     var gitAvailable = false,
         gutterName = "brackets-git-gutter",
         editorsWithGutters = [],
@@ -1538,7 +1541,7 @@ define("src/GutterManager", function (require, exports) {
         }
     }
 
-    function showGutters(editor, _results) {
+    function _showGutters(editor, _results) {
         prepareGutter(editor);
 
         var cm = editor._codeMirror;
@@ -1550,8 +1553,8 @@ define("src/GutterManager", function (require, exports) {
         cm.clearGutter(gutterName);
         cm.gitGutters.forEach(function (obj) {
             var $marker = $("<div>")
-                            .addClass(gutterName + "-" + obj.type + " gitline-" + (obj.line + 1))
-                            .html("&nbsp;");
+                .addClass(gutterName + "-" + obj.type + " gitline-" + (obj.line + 1))
+                .html("&nbsp;");
             cm.setGutterMarker(obj.line, gutterName, $marker[0]);
         });
         _cursorActivity(null, editor);
@@ -1627,6 +1630,48 @@ define("src/GutterManager", function (require, exports) {
         return doc && doc._masterEditor;
     }
 
+    function hasVerticalScrollbar(editor) {
+        const cm = editor._codeMirror;
+        const scrollEl = cm.getScrollerElement();
+        return scrollEl.scrollHeight > scrollEl.clientHeight;
+    }
+
+
+    function _markScrollbar(editor, allChanges) {
+        ScrollTrackMarkers.clear(editor, GIT_SCROLL_MARKS);
+        if(!hasVerticalScrollbar(editor)){
+            return;
+        }
+        const added = allChanges
+            .filter(item => item.type === "added")
+            .map(({ line }) => ({ line, ch: 0 }));
+
+        const removed = allChanges
+            .filter(item => item.type === "removed")
+            .map(({ line }) => ({ line, ch: 0 }));
+
+        const modified = allChanges
+            .filter(item => item.type === "modified")
+            .map(({ line }) => ({ line, ch: 0 }));
+
+        const trackers = [
+            {arr: added, css: "brackets-git-added"},
+            {arr: removed, css: "brackets-git-removed"},
+            {arr: modified, css: "brackets-git-modified"}
+        ];
+        for(let tracker of trackers) {
+            if( !tracker.arr.length ){
+                continue;
+            }
+            let posArray = tracker.arr.map(item => ({ line: item.line, ch: 0 }));
+            ScrollTrackMarkers.addTickmarks(editor, posArray, {
+                trackStyle: ScrollTrackMarkers.TRACK_STYLES.ON_LEFT,
+                name: GIT_SCROLL_MARKS,
+                cssColorClass: tracker.css
+            });
+        }
+    }
+
     function processDiffResults(editor, diff) {
         var added = [],
             removed = [],
@@ -1652,9 +1697,9 @@ define("src/GutterManager", function (require, exports) {
                     type: "removed",
                     line: lineRemovedFrom,
                     content: str.split("\n")
-                                .filter(function (l) { return l.indexOf("-") === 0; })
-                                .map(function (l) { return l.substring(1); })
-                                .join("\n")
+                        .filter(function (l) { return l.indexOf("-") === 0; })
+                        .map(function (l) { return l.substring(1); })
+                        .join("\n")
                 });
             }
 
@@ -1692,7 +1737,9 @@ define("src/GutterManager", function (require, exports) {
             o.line = o.line + 1;
         });
 
-        showGutters(editor, [].concat(added, removed, modified));
+        const allChanges = [].concat(added, removed, modified);
+        _showGutters(editor, allChanges);
+        _markScrollbar(editor, allChanges);
     }
 
     function refresh() {