From 5a1a26b43859345c9773b647231b2f7fe47d1aea Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Wed, 9 Jul 2025 23:03:05 +0530
Subject: [PATCH 01/43] fix: profile button text not centralized

---
 src/services/profile-menu.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js
index 517fd9a356..7d8444ed49 100644
--- a/src/services/profile-menu.js
+++ b/src/services/profile-menu.js
@@ -13,9 +13,9 @@ define(function (require, exports, module) {
 
     function _createSVGIcon(initials, bgColor) {
         return `<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-            <circle cx="12" cy="12" r="10" fill="${bgColor}"/>
-  <text x="50%" y="58%" text-anchor="middle" font-size="11" fill="#fff" font-family="Inter, sans-serif" dy=".1em">
-    ${initials}</text>
+                <circle cx="12" cy="12" r="10" fill="${bgColor}"/>
+            <text x="12" y="12" text-anchor="middle" dominant-baseline="central" font-size="10" fill="#fff" font-family="Inter, sans-serif">
+            ${initials}</text>
         </svg>`;
     }
 

From 4252e7628620783ebc2d4d8aeefb8e9a78d84ab4 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 00:04:57 +0530
Subject: [PATCH 02/43] feat: add cancel button in add snippet panel

---
 .../CustomSnippets/htmlContent/snippets-panel.html          | 5 +++--
 src/extensionsIntegrated/CustomSnippets/main.js             | 6 ++++++
 src/styles/Extn-CustomSnippets.less                         | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
index 67d85ead76..8c7abf6b98 100644
--- a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
+++ b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
@@ -111,8 +111,9 @@
                 </div>
             </div>
 
-            <div id="save-custom-snippet-btn">
-                <button class="dialog-button btn primary" disabled>Save</button>
+            <div id="add-custom-snippet-panel-buttons">
+                <button id="cancel-custom-snippet-btn" class="dialog-button btn">Cancel</button>
+                <button id="save-custom-snippet-btn" class="dialog-button btn primary" disabled>Save</button>
             </div>
         </div>
 
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index e27d9d39a5..8c2cdcc2e2 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -122,6 +122,7 @@ define(function (require, exports, module) {
     function _registerHandlers() {
         const $closePanelBtn = $("#close-custom-snippets-panel-btn");
         const $saveCustomSnippetBtn = $("#save-custom-snippet-btn");
+        const $cancelCustomSnippetBtn = $("#cancel-custom-snippet-btn");
         const $abbrInput = $("#abbr-box");
         const $descInput = $("#desc-box");
         const $templateInput = $("#template-text-box");
@@ -159,6 +160,11 @@ define(function (require, exports, module) {
             Driver.handleSaveBtnClick();
         });
 
+        $cancelCustomSnippetBtn.on("click", function () {
+            UIHelper.showSnippetListMenu();
+            SnippetsList.showSnippetsList();
+        });
+
         $abbrInput.on("input", Helper.toggleSaveButtonDisability);
         $templateInput.on("input", Helper.toggleSaveButtonDisability);
 
diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index ffff63c228..020e37fe6f 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -534,11 +534,14 @@
         }
     }
 
-    #save-custom-snippet-btn {
+    #add-custom-snippet-panel-buttons {
         margin-top: 8px;
         padding-top: 8px;
         border-top: 1px solid @bc-panel-separator;
         text-align: right;
+        display: flex;
+        gap: 10px;
+        justify-content: flex-end;
 
         .dark & {
             border-top: 1px solid @dark-bc-panel-separator;

From ae7dbc43cc79ab194b14cf7c2cdc6cb1fce031a2 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 00:08:33 +0530
Subject: [PATCH 03/43] fix: save button always remain disabled

---
 src/extensionsIntegrated/CustomSnippets/helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 3eebe8bdaa..21644aa614 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -128,7 +128,7 @@ define(function (require, exports, module) {
         const $abbrInput = $("#abbr-box");
         const $templateInput = $("#template-text-box");
 
-        const $saveBtn = $("#save-custom-snippet-btn button");
+        const $saveBtn = $("#save-custom-snippet-btn");
 
         // make sure that the required fields has some value
         const hasAbbr = $abbrInput.val().trim().length > 0;

From 4004cfd9d2e192aa718171157f0b26befe9c90c5 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 11:35:17 +0530
Subject: [PATCH 04/43] feat: auto update API docs

---
 docs/API-Reference/editor/CodeHintManager.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/API-Reference/editor/CodeHintManager.md b/docs/API-Reference/editor/CodeHintManager.md
index 986b86748c..653b60d6a4 100644
--- a/docs/API-Reference/editor/CodeHintManager.md
+++ b/docs/API-Reference/editor/CodeHintManager.md
@@ -227,6 +227,8 @@ insertHintOnTab Preference.
     * [.registerHintProvider(provider, languageIds, priority)](#module_CodeHintManager..registerHintProvider)
     * [.hasValidExclusion(exclusion, textAfterCursor)](#module_CodeHintManager..hasValidExclusion) ⇒ <code>boolean</code>
     * [.isOpen()](#module_CodeHintManager..isOpen) ⇒ <code>boolean</code>
+    * [.showHintsAtTop(handler)](#module_CodeHintManager..showHintsAtTop)
+    * [.clearHintsAtTop()](#module_CodeHintManager..clearHintsAtTop)
 
 <a name="module_CodeHintManager..registerHintProvider"></a>
 
@@ -263,3 +265,21 @@ Test if a hint popup is open.
 
 **Kind**: inner method of [<code>CodeHintManager</code>](#module_CodeHintManager)  
 **Returns**: <code>boolean</code> - - true if the hints are open, false otherwise.  
+<a name="module_CodeHintManager..showHintsAtTop"></a>
+
+### CodeHintManager.showHintsAtTop(handler)
+Register a handler to show hints at the top of the hint list.
+This API allows extensions to add their own hints at the top of the standard hint list.
+
+**Kind**: inner method of [<code>CodeHintManager</code>](#module_CodeHintManager)
+
+| Param | Type | Description |
+| --- | --- | --- |
+| handler | <code>Object</code> | A hint provider object with standard methods:   - hasHints: function(editor, implicitChar) - returns true if hints are available   - getHints: function(editor, implicitChar) - returns hint response object with hints array   - insertHint: function(hint) - handles hint insertion, returns true if handled |
+
+<a name="module_CodeHintManager..clearHintsAtTop"></a>
+
+### CodeHintManager.clearHintsAtTop()
+Unregister the hints at top handler.
+
+**Kind**: inner method of [<code>CodeHintManager</code>](#module_CodeHintManager)

From e5d2653d345912d7f4163f720339f644575d6ccb Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 12:10:28 +0530
Subject: [PATCH 05/43] fix: increase panel min size so that the save, cancel
 buttons are always visible

---
 src/extensionsIntegrated/CustomSnippets/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 8c2cdcc2e2..caa7fa9e8c 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -41,7 +41,7 @@ define(function (require, exports, module) {
     const MY_COMMAND_ID = "custom_snippets";
     const PANEL_ID = "customSnippets.panel";
     const MENU_ITEM_NAME = "Custom Snippets..."; // this name will appear as the menu item
-    const PANEL_MIN_SIZE = 100; // the minimum size more than which its height cannot be decreased
+    const PANEL_MIN_SIZE = 340; // the minimum size more than which its height cannot be decreased
 
     // this is to store the panel reference,
     // as we only need to create this once. rest of the time we can just toggle the visibility of the panel

From 078502c5af0f54663408e5196e55003ea09b8646 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 12:24:56 +0530
Subject: [PATCH 06/43] fix: update text in the no snippets present panel

---
 .../CustomSnippets/snippetsList.js                  |  2 +-
 src/styles/Extn-CustomSnippets.less                 | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index b69bd99147..a8b6b94b2e 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -104,7 +104,7 @@ define(function (require, exports, module) {
         if (filterText) {
             $emptyMessage.text(`No snippets match "${filterText}"`);
         } else {
-            $emptyMessage.text("No custom snippets added yet!");
+            $emptyMessage.html('Add your own code hints to speed up coding - <a href="https://docs.phcode.dev" target="_blank">Learn More</a>');
         }
     }
 
diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 020e37fe6f..17c8c39bcd 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -331,6 +331,19 @@
     .dark & {
         color: @dark-bc-text-thin;
     }
+
+    a {
+        color: @bc-btn-border-focused;
+        text-decoration: none;
+
+        &:hover {
+            text-decoration: underline;
+        }
+
+        .dark & {
+            color: @dark-bc-btn-border-focused;
+        }
+    }
 }
 
 #add-snippet-btn button {

From f4db68f679c32b277743698cce3743577aad56d2 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 13:38:11 +0530
Subject: [PATCH 07/43] fix: back button text not properly centralized

---
 .../htmlContent/snippets-panel.html              |  3 ++-
 src/styles/Extn-CustomSnippets.less              | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
index 8c7abf6b98..df81357650 100644
--- a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
+++ b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
@@ -9,7 +9,8 @@
             </div>
             <div id="back-to-list-menu-btn" class="custom-snippet-btn hidden">
                 <button title="Back to snippets list">
-                    <i class="fas fa-chevron-left"></i> Back
+                    <i class="back-btn-left-icon fas fa-chevron-left"></i>
+                    <span class="back-btn-text">Back</span>
                 </button>
             </div>
         </div>
diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 17c8c39bcd..30ee0df886 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -72,6 +72,22 @@
     }
 }
 
+.custom-snippet-btn button {
+    display: flex;
+    align-items: center;
+}
+
+.custom-snippet-btn .back-btn-left-icon {
+    position: relative;
+    top: 1px;
+    margin-right: 4px;
+}
+
+.custom-snippet-btn .back-btn-text {
+    position: relative;
+    top: 0.6px;
+}
+
 .filter-snippets-panel {
     display: inline-block;
 }

From 4236acd9608f6b7499e0e38ec23edf077e391fe1 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 13:58:15 +0530
Subject: [PATCH 08/43] feat: add check state on menu item when panel is open

---
 src/extensionsIntegrated/CustomSnippets/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index caa7fa9e8c..2b37b7ca46 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -72,8 +72,10 @@ define(function (require, exports, module) {
     function _togglePanelVisibility() {
         if (customSnippetsPanel.isVisible()) {
             customSnippetsPanel.hide();
+            CommandManager.get(MY_COMMAND_ID).setChecked(false);
         } else {
             customSnippetsPanel.show();
+            CommandManager.get(MY_COMMAND_ID).setChecked(true);
 
             $("#filter-snippets-input").val("");
             UIHelper.initializeListViewToolbarTitle();
@@ -89,6 +91,7 @@ define(function (require, exports, module) {
      */
     function _hidePanel() {
         customSnippetsPanel.hide();
+        CommandManager.get(MY_COMMAND_ID).setChecked(false);
     }
 
     /**
@@ -101,6 +104,7 @@ define(function (require, exports, module) {
         // if it is then we can just toggle its visibility
         if (!customSnippetsPanel) {
             _createPanel();
+            CommandManager.get(MY_COMMAND_ID).setChecked(true);
         } else {
             _togglePanelVisibility();
         }

From f985b8b42d07cf316d68395615f78106bec3ab06 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 16:00:53 +0530
Subject: [PATCH 09/43] fix: alignment of plus icon in the add snippet button

---
 src/styles/Extn-CustomSnippets.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 30ee0df886..f5be4b5417 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -88,6 +88,11 @@
     top: 0.6px;
 }
 
+.custom-snippet-btn .fa-plus {
+    position: relative;
+    top: 0.6px;
+}
+
 .filter-snippets-panel {
     display: inline-block;
 }

From c619e32273173804572a078102b4c43029a5cee2 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 16:04:13 +0530
Subject: [PATCH 10/43] fix: back button alignment

---
 src/styles/Extn-CustomSnippets.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index f5be4b5417..f042c8d50c 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -79,7 +79,7 @@
 
 .custom-snippet-btn .back-btn-left-icon {
     position: relative;
-    top: 1px;
+    top: 0.6px;
     margin-right: 4px;
 }
 

From 1ff336d98b17ab3955535b319339df5e74e4db3a Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 16:27:57 +0530
Subject: [PATCH 11/43] fix: move the content a bit right to maintain hierarchy
 structure

---
 src/styles/Extn-CustomSnippets.less | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index f042c8d50c..b1cd6581fc 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -403,7 +403,7 @@
     color: @bc-text-thin-quiet;
     font-size: 12px;
     font-style: italic;
-    margin-left: 132px;
+    margin-left: 144px;
     padding: 0;
     background: none;
     border: none;
@@ -460,6 +460,8 @@
         display: flex;
         align-items: flex-start;
         margin-bottom: 8px;
+        margin-left: 12px;
+        margin-right: 8px;
         gap: 4px;
         flex-direction: column;
 
@@ -570,6 +572,8 @@
 
     #add-custom-snippet-panel-buttons {
         margin-top: 8px;
+        margin-left: 12px;
+        margin-right: 8px;
         padding-top: 8px;
         border-top: 1px solid @bc-panel-separator;
         text-align: right;
@@ -612,6 +616,8 @@
         display: flex;
         align-items: flex-start;
         margin-bottom: 8px;
+        margin-left: 12px;
+        margin-right: 8px;
         gap: 4px;
         flex-direction: column;
 
@@ -722,6 +728,8 @@
 
     #edit-snippet-buttons {
         margin-top: 8px;
+        margin-left: 12px;
+        margin-right: 8px;
         padding-top: 8px;
         border-top: 1px solid @bc-panel-separator;
         text-align: right;
@@ -789,6 +797,9 @@
     #custom-snippets-add-new,
     #custom-snippets-edit {
         .field-wrapper {
+            margin-left: 8px;
+            margin-right: 4px;
+
             .field-row {
                 flex-direction: column;
                 align-items: stretch;
@@ -799,10 +810,16 @@
                 }
             }
         }
+
+        #add-custom-snippet-panel-buttons,
+        #edit-snippet-buttons {
+            margin-left: 8px;
+            margin-right: 4px;
+        }
     }
 
     .error-message {
-        margin-left: 0;
+        margin-left: 8px;
     }
 }
 
@@ -819,6 +836,14 @@
 
         .field-wrapper {
             margin-bottom: 6px;
+            margin-left: 6px;
+            margin-right: 3px;
+        }
+
+        #add-custom-snippet-panel-buttons,
+        #edit-snippet-buttons {
+            margin-left: 6px;
+            margin-right: 3px;
         }
     }
 }

From e7d59a36491b5a5692476e7df1f568972aa49040 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 17:00:20 +0530
Subject: [PATCH 12/43] fix: made close button styling consistent to other
 panels close button

---
 .../htmlContent/snippets-panel.html           |  4 +---
 src/styles/Extn-CustomSnippets.less           | 22 +++++--------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
index df81357650..fd4c253f59 100644
--- a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
+++ b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
@@ -18,9 +18,7 @@
             <div id="filter-snippets-panel" class="filter-snippets-panel">
                 <input id="filter-snippets-input" type="text" placeholder="Filter..." autocomplete="off" />
             </div>
-            <div id="close-custom-snippets-panel-btn">
-                <button><i class="fas fa-times"></i></button>
-            </div>
+            <a href="#" class="close" id="close-custom-snippets-panel-btn">&times;</a>
         </div>
     </div>
 
diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index b1cd6581fc..340c703de4 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -93,6 +93,10 @@
     top: 0.6px;
 }
 
+#custom-snippets-panel .close {
+    padding-top: 2.5px;
+}
+
 .filter-snippets-panel {
     display: inline-block;
 }
@@ -107,23 +111,7 @@
     min-width: 120px;
     margin-bottom: 0;
     margin-top: -4px;
-}
-
-#close-custom-snippets-panel-btn button {
-    background: transparent;
-    border: none;
-    outline: none;
-    font-size: 13px;
-    opacity: 0.7;
-    color: @bc-text;
-
-    .dark & {
-        color: @dark-bc-text;
-    }
-
-    &:hover {
-        opacity: 0.9;
-    }
+    margin-right: 30px;
 }
 
 #custom-snippets-list.hidden {

From a5932f5ad0bc99f4fd18f6081d78be6a1807e150 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 17:04:39 +0530
Subject: [PATCH 13/43] fix: make filter input consistent to other panels
 filter input

---
 src/styles/Extn-CustomSnippets.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 340c703de4..93241fc009 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -107,7 +107,6 @@
 
 .filter-snippets-panel #filter-snippets-input {
     height: 14px;
-    width: 180px;
     min-width: 120px;
     margin-bottom: 0;
     margin-top: -4px;

From 5ad4a125b19e1325f208a6b1cad7e249726269f7 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 17:19:35 +0530
Subject: [PATCH 14/43] fix: set min width to the template textare to keep it
 consistent to other input fields

---
 src/styles/Extn-CustomSnippets.less | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 93241fc009..99da153d4a 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -545,6 +545,7 @@
         textarea {
             min-height: 80px;
             max-height: 120px;
+            min-width: 156px;
             resize: none;
             line-height: 1.4;
             white-space: pre-wrap;
@@ -701,6 +702,7 @@
         textarea {
             min-height: 80px;
             max-height: 120px;
+            min-width: 156px;
             resize: none;
             line-height: 1.4;
             white-space: pre-wrap;
@@ -779,6 +781,15 @@
                 min-width: auto;
             }
         }
+
+        #custom-snippets-add-new,
+        #custom-snippets-edit {
+            .field-wrapper {
+                textarea {
+                    min-width: auto;
+                }
+            }
+        }
     }
 
     #custom-snippets-add-new,

From 41bc07d9ccfa6ed56eb1959dae3b0ad5dcf649d9 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Thu, 10 Jul 2025 18:14:41 +0530
Subject: [PATCH 15/43] feat: disable reset button in edit panel when nothing
 to reset

---
 .../CustomSnippets/helper.js                  | 33 +++++++++++++++++++
 .../CustomSnippets/main.js                    |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 21644aa614..8a08a9dfe8 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -396,6 +396,38 @@ define(function (require, exports, module) {
         const hasAbbr = $abbrInput.val().trim().length > 0;
         const hasTemplate = $templateInput.val().trim().length > 0;
         $saveBtn.prop("disabled", !(hasAbbr && hasTemplate));
+
+        // Also toggle the reset button state
+        toggleResetButtonDisability();
+    }
+
+    /**
+     * This function checks if the snippet is in its default state and
+     * disables the reset button if it is
+     */
+    function toggleResetButtonDisability() {
+        const $editView = $("#custom-snippets-edit");
+        const originalSnippet = $editView.data("originalSnippet");
+        const $resetBtn = $("#reset-snippet-btn");
+
+        if (!originalSnippet) {
+            // If there's no original snippet data, disable the reset button
+            $resetBtn.prop("disabled", true);
+            return;
+        }
+
+        // Get current values from the form
+        const currentData = getEditSnippetData();
+
+        // Check if current values match original values
+        const isDefault =
+            currentData.abbreviation === originalSnippet.abbreviation &&
+            currentData.description === (originalSnippet.description || "") &&
+            currentData.templateText === originalSnippet.templateText &&
+            currentData.fileExtension === originalSnippet.fileExtension;
+
+        // Disable reset button if in default state
+        $resetBtn.prop("disabled", isDefault);
     }
 
     /**
@@ -769,6 +801,7 @@ define(function (require, exports, module) {
     exports.populateEditForm = populateEditForm;
     exports.getEditSnippetData = getEditSnippetData;
     exports.toggleEditSaveButtonDisability = toggleEditSaveButtonDisability;
+    exports.toggleResetButtonDisability = toggleResetButtonDisability;
     exports.clearEditInputFields = clearEditInputFields;
     exports.handleTextareaTabKey = handleTextareaTabKey;
     exports.validateAbbrInput = validateAbbrInput;
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 2b37b7ca46..5c4ff7f432 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -201,7 +201,9 @@ define(function (require, exports, module) {
         });
 
         $editAbbrInput.on("input", Helper.toggleEditSaveButtonDisability);
+        $editDescInput.on("input", Helper.toggleEditSaveButtonDisability);
         $editTemplateInput.on("input", Helper.toggleEditSaveButtonDisability);
+        $editFileExtnInput.on("input", Helper.toggleEditSaveButtonDisability);
 
         $editAbbrInput.on("keydown", function (e) {
             Helper.validateAbbrInput(e, this);

From 11552b6cb65f278186133a43ef0ae31ce8eb296a Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 12:03:41 +0530
Subject: [PATCH 16/43] fix: ui layout issues in snippets list header

---
 src/styles/Extn-CustomSnippets.less | 149 +++++++++++++++++++++-------
 1 file changed, 111 insertions(+), 38 deletions(-)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 99da153d4a..368398a0a8 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -151,13 +151,14 @@
 }
 
 #snippets-list-header {
-    display: flex;
-    align-items: center;
-    padding: 6px 13px;
+    display: block;
+    padding: 4px 12px 4px 16px;
     margin: 0;
     border: none;
-    font-weight: 700;
     background-color: #c2c7c7;
+    font-size: 0;
+    white-space: nowrap;
+    line-height: 20px;
 
     .dark & {
         background-color: #202020;
@@ -166,41 +167,91 @@
 
 #snippet-abbr-header,
 #snippet-abbr {
-    flex: 1;
+    width: 15%;
     min-width: 80px;
+    display: inline-block;
+    vertical-align: middle;
+    box-sizing: border-box;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 #snippet-template-header,
 #snippet-template {
-    flex: 2.4;
-    min-width: 100px;
+    width: 35%;
+    min-width: 120px;
+    display: inline-block;
+    vertical-align: middle;
+    padding: 0 12px;
+    box-sizing: border-box;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 #snippet-description-header,
 #snippet-description {
-    flex: 1.5;
-    min-width: 80px;
+    width: 25%;
+    min-width: 100px;
+    display: inline-block;
+    vertical-align: middle;
+    padding: 0 12px;
+    box-sizing: border-box;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 #snippet-file-extension-header,
 #snippet-files {
-    flex: 0.8;
+    width: 15%;
     min-width: 60px;
+    display: inline-block;
+    vertical-align: middle;
     text-align: center;
+    box-sizing: border-box;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#snippet-actions-header {
+    width: 10%;
+    min-width: 40px;
+    display: inline-block;
+    vertical-align: middle;
+    box-sizing: border-box;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
 }
 
 .snippet-item {
-    display: flex;
-    align-items: center;
-    padding: 4px 12px 4px 16px;
+    display: block;
+    padding: 2px 12px 2px 16px;
     margin: 0;
     border-bottom: 1px solid transparent;
     background-color: @bc-panel-bg;
     color: @bc-text;
-    line-height: 16px;
     position: relative;
     cursor: pointer;
     transition: background-color 0.1s ease;
+    font-size: 0;
+    white-space: nowrap;
+    line-height: 20px;
 
     .dark & {
         background-color: @dark-bc-panel-bg;
@@ -238,11 +289,24 @@
     }
 }
 
+#snippet-abbr-header {
+    color: @bc-text;
+
+    .dark & {
+        color: @dark-bc-text;
+    }
+}
+
 #snippet-abbr {
     color: @bc-text;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+
+    .dark & {
+        color: @dark-bc-text;
+    }
+}
+
+#snippet-template-header {
+    color: @bc-text;
 
     .dark & {
         color: @dark-bc-text;
@@ -250,34 +314,39 @@
 }
 
 #snippet-template {
-    margin: 0 12px;
     color: @bc-text-thin;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 
     .dark & {
         color: @dark-bc-text-thin;
     }
 }
 
+#snippet-description-header {
+    color: @bc-text;
+
+    .dark & {
+        color: @dark-bc-text;
+    }
+}
+
 #snippet-description {
-    margin: 0 12px;
     color: @bc-text-thin-quiet;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 
     .dark & {
         color: @dark-bc-text-thin-quiet;
     }
 }
 
+#snippet-file-extension-header {
+    color: @bc-text;
+
+    .dark & {
+        color: @dark-bc-text;
+    }
+}
+
 #snippet-files {
     color: @bc-text-thin-quiet;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 
     .dark & {
         color: @dark-bc-text-thin-quiet;
@@ -285,15 +354,19 @@
 }
 
 .delete-snippet-btn {
+    width: 10%;
+    min-width: 40px;
+    display: inline-block;
+    vertical-align: middle;
+    box-sizing: border-box;
     color: @bc-text-thin-quiet;
     cursor: pointer;
     opacity: 0.3;
     transition: opacity 0.1s ease;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 0.9rem;
-    padding: 3px 6px;
+    text-align: center;
+    font-size: 14px;
+    line-height: 20px;
+    padding: 0;
 
     .dark & {
         color: @dark-bc-text-thin-quiet;
@@ -309,11 +382,11 @@
     }
 
     i {
-        width: 12px;
-        height: 12px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+        display: inline-block;
+        text-align: center;
+        font-size: 12px;
+        line-height: 20px;
+        vertical-align: middle;
     }
 }
 

From 90a8a51f10d096d71c87fbf75020cf32f0dd60c4 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 15:02:51 +0530
Subject: [PATCH 17/43] fix: font weight issue for snippet list

---
 src/styles/Extn-CustomSnippets.less | 67 +++++++++++++++++------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index 368398a0a8..a90af44b61 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -166,9 +166,9 @@
 }
 
 #snippet-abbr-header,
-#snippet-abbr {
-    width: 15%;
-    min-width: 80px;
+#snippet-template-header,
+#snippet-description-header,
+#snippet-file-extension-header {
     display: inline-block;
     vertical-align: middle;
     box-sizing: border-box;
@@ -180,52 +180,65 @@
     text-overflow: ellipsis;
 }
 
-#snippet-template-header,
-#snippet-template {
+#snippet-abbr-header {
+    width: 15%;
+    min-width: 80px;
+}
+
+#snippet-template-header {
     width: 35%;
     min-width: 120px;
+    padding: 0 12px;
+}
+
+#snippet-description-header {
+    width: 25%;
+    min-width: 100px;
+    padding: 0 12px;
+}
+
+#snippet-file-extension-header {
+    width: 15%;
+    min-width: 60px;
+    text-align: center;
+}
+
+#snippet-abbr,
+#snippet-template,
+#snippet-description,
+#snippet-files {
     display: inline-block;
     vertical-align: middle;
-    padding: 0 12px;
     box-sizing: border-box;
     font-size: 14px;
-    font-weight: 500;
+    font-weight: normal;
     line-height: 20px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-#snippet-description-header,
+#snippet-abbr {
+    width: 15%;
+    min-width: 80px;
+}
+
+#snippet-template {
+    width: 35%;
+    min-width: 120px;
+    padding: 0 12px;
+}
+
 #snippet-description {
     width: 25%;
     min-width: 100px;
-    display: inline-block;
-    vertical-align: middle;
     padding: 0 12px;
-    box-sizing: border-box;
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
-#snippet-file-extension-header,
 #snippet-files {
     width: 15%;
     min-width: 60px;
-    display: inline-block;
-    vertical-align: middle;
     text-align: center;
-    box-sizing: border-box;
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
 #snippet-actions-header {

From 99c819ae98218d9429916adf198b503174881852 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 16:09:12 +0530
Subject: [PATCH 18/43] feat: allow users to write file extension in any format

---
 .../CustomSnippets/helper.js                  | 76 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 8a08a9dfe8..fdeeb494d7 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -95,6 +95,72 @@ define(function (require, exports, module) {
         return languageMap[languageId] || languageId;
     }
 
+    /**
+     * This function is to make sure file extensions are properly formatted with leading dots
+     * because user may provide values in not very consistent manner, we need to handle all those cases
+     * For ex: what we expect: `.js, .html, .css`
+     * what user may provide: `js, html, css` or: `js html css` or `.js.html.css` etc
+     *
+     * This function processes file extensions in various formats and ensures they:
+     * - Have a leading dot (if not empty or "all")
+     * - Are properly separated with commas and spaces
+     * - Don't contain empty or standalone dots
+     *
+     * @param {string} extension - The file extension(s) to process
+     * @returns {string} - The properly formatted file extension(s)
+     */
+    function processFileExtensionInput(extension) {
+        if (!extension || extension === "all") {
+            return extension;
+        }
+
+        // Step 1: normalize the input by converting spaces to commas if no commas exist
+        if (extension.includes(" ")) {
+            extension = extension.replace(/\s+/g, ",");
+        }
+
+        // Step 2: handle multiple extensions joined by dots (e.g., ".less.css.js")
+        // Only process if multiple dots exist and not already comma-separated
+        const dotCount = (extension.match(/\./g) || []).length;
+        if (dotCount > 1) {
+            // remove the leading dot if present for consistent processing
+            const extensionWithoutLeadingDot = extension.startsWith(".") ? extension.substring(1) : extension;
+
+            // split by dot, filter empty parts, add leading dot to each part
+            const parts = extensionWithoutLeadingDot
+                .split(".")
+                .filter((part) => part !== "")
+                .map((part) => "." + part);
+
+            return parts.join(", ");
+        }
+
+        // Step 3: process comma-separated extensions
+        if (extension.includes(",")) {
+            return extension
+                .split(",")
+                .map((ext) => {
+                    ext = ext.trim();
+                    // skip all the standalone dots or empty entries
+                    if (ext === "." || ext === "") {
+                        return "";
+                    }
+                    // Add leading dot if missing
+                    return ext.startsWith(".") ? ext : "." + ext;
+                })
+                .filter((ext) => ext !== "") // Remove empty entries
+                .join(", ");
+        }
+
+        // Step 4: Handle single extension
+        if (extension === ".") {
+            return ""; // remove standalone dot
+        }
+
+        // Add leading dot if missing
+        return extension.startsWith(".") ? extension : "." + extension;
+    }
+
     /**
      * This function is responsible to get the snippet data from all the required input fields
      * it is called when the save button is clicked
@@ -108,11 +174,14 @@ define(function (require, exports, module) {
         const templateText = $("#template-text-box").val().trim();
         const fileExtension = $("#file-extn-box").val().trim();
 
+        // process the file extension so that we can get the value in the required format
+        const processedFileExtension = processFileExtensionInput(fileExtension);
+
         return {
             abbreviation: abbreviation,
             description: description || "", // allow empty description
             templateText: templateText,
-            fileExtension: fileExtension || "all" // default to "all" if empty
+            fileExtension: processedFileExtension || "all" // default to "all" if empty
         };
     }
 
@@ -374,11 +443,14 @@ define(function (require, exports, module) {
         const templateText = $("#edit-template-text-box").val().trim();
         const fileExtension = $("#edit-file-extn-box").val().trim();
 
+        // process the file extension so that we can get the value in the required format
+        const processedFileExtension = processFileExtensionInput(fileExtension);
+
         return {
             abbreviation: abbreviation,
             description: description || "", // allow empty description
             templateText: templateText,
-            fileExtension: fileExtension || "all" // default to "all" if empty
+            fileExtension: processedFileExtension || "all" // default to "all" if empty
         };
     }
 

From f941f0153e8e0249d14e3acbdf8def3bc0dafa97 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 17:13:35 +0530
Subject: [PATCH 19/43] fix: mutliple commas appearing when parsing failed

---
 .../CustomSnippets/helper.js                  | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index fdeeb494d7..0b85a9fb5f 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -105,6 +105,7 @@ define(function (require, exports, module) {
      * - Have a leading dot (if not empty or "all")
      * - Are properly separated with commas and spaces
      * - Don't contain empty or standalone dots
+     * - No consecutive commas
      *
      * @param {string} extension - The file extension(s) to process
      * @returns {string} - The properly formatted file extension(s)
@@ -119,25 +120,12 @@ define(function (require, exports, module) {
             extension = extension.replace(/\s+/g, ",");
         }
 
-        // Step 2: handle multiple extensions joined by dots (e.g., ".less.css.js")
-        // Only process if multiple dots exist and not already comma-separated
-        const dotCount = (extension.match(/\./g) || []).length;
-        if (dotCount > 1) {
-            // remove the leading dot if present for consistent processing
-            const extensionWithoutLeadingDot = extension.startsWith(".") ? extension.substring(1) : extension;
+        let result = "";
 
-            // split by dot, filter empty parts, add leading dot to each part
-            const parts = extensionWithoutLeadingDot
-                .split(".")
-                .filter((part) => part !== "")
-                .map((part) => "." + part);
-
-            return parts.join(", ");
-        }
-
-        // Step 3: process comma-separated extensions
+        // Step 2: process comma-separated extensions FIRST (before dot-separated)
+        // this prevents issues with inputs like ".js,.html,." or ".js,,.html"
         if (extension.includes(",")) {
-            return extension
+            result = extension
                 .split(",")
                 .map((ext) => {
                     ext = ext.trim();
@@ -150,15 +138,36 @@ define(function (require, exports, module) {
                 })
                 .filter((ext) => ext !== "") // Remove empty entries
                 .join(", ");
+        } else {
+            // Step 3: handle multiple extensions joined by dots (e.g., ".less.css.js")
+            // Only process if multiple dots exist and no commas
+            const dotCount = (extension.match(/\./g) || []).length;
+            if (dotCount > 1) {
+                // remove the leading dot if present for consistent processing
+                const extensionWithoutLeadingDot = extension.startsWith(".") ? extension.substring(1) : extension;
+
+                // split by dot, filter empty parts, add leading dot to each part
+                const parts = extensionWithoutLeadingDot
+                    .split(".")
+                    .filter((part) => part !== "")
+                    .map((part) => "." + part);
+
+                result = parts.join(", ");
+            } else {
+                // Step 4: Handle single extension
+                if (extension === ".") {
+                    result = ""; // remove standalone dot
+                } else {
+                    // Add leading dot if missing
+                    result = extension.startsWith(".") ? extension : "." + extension;
+                }
+            }
         }
 
-        // Step 4: Handle single extension
-        if (extension === ".") {
-            return ""; // remove standalone dot
-        }
+        // this is just the final safeguard to remove any consecutive commas and clean up spacing
+        result = result.replace(/,\s*,+/g, ",").replace(/,\s*$/, "").replace(/^\s*,/, "").trim();
 
-        // Add leading dot if missing
-        return extension.startsWith(".") ? extension : "." + extension;
+        return result;
     }
 
     /**

From 4148d561e01e12e9b7be2abdd8224fe20694d030 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 17:20:04 +0530
Subject: [PATCH 20/43] fix: remove trailing dot from result

---
 src/extensionsIntegrated/CustomSnippets/helper.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 0b85a9fb5f..379f48f318 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -166,6 +166,8 @@ define(function (require, exports, module) {
 
         // this is just the final safeguard to remove any consecutive commas and clean up spacing
         result = result.replace(/,\s*,+/g, ",").replace(/,\s*$/, "").replace(/^\s*,/, "").trim();
+        // remove trailing dots (like .css. -> .css)
+        result = result.endsWith('.') ? result.slice(0, -1) : result;
 
         return result;
     }

From 3191f02ef06e6f3034e6942433d8e0d9f0212da3 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 18:17:28 +0530
Subject: [PATCH 21/43] feat: save snippets to file storage instead of prefs
 manager

---
 .../CustomSnippets/driver.js                  | 22 ++++--
 .../CustomSnippets/main.js                    | 11 ++-
 .../CustomSnippets/snippetsList.js            | 16 ++++-
 .../CustomSnippets/snippetsState.js           | 68 ++++++++++++-------
 4 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index bd3871558f..2b8ce27adf 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -45,7 +45,15 @@ define(function (require, exports, module) {
             Global.SnippetHintsList.push(snippetData);
             Helper.clearAllInputFields();
             Helper.toggleSaveButtonDisability();
-            SnippetsState.saveSnippetsToState();
+
+            // save to file storage
+            SnippetsState.saveSnippetsToState()
+                .then(function () {
+                    //
+                })
+                .catch(function (error) {
+                    console.error("failed to save custom snippet correctly:", error);
+                });
 
             // we need to move back to snippets list view after a snippet is saved
             UIHelper.showSnippetListMenu();
@@ -87,7 +95,15 @@ define(function (require, exports, module) {
         // update the snippet in the list
         if (snippetIndex !== -1) {
             Global.SnippetHintsList[snippetIndex] = editedData;
-            SnippetsState.saveSnippetsToState();
+
+            // save to file storage
+            SnippetsState.saveSnippetsToState()
+                .then(function () {
+                    //
+                })
+                .catch(function (error) {
+                    console.error("failed to save custom snippet correctly:", error);
+                });
 
             // clear the stored data
             $editView.removeData("originalSnippet");
@@ -164,8 +180,6 @@ define(function (require, exports, module) {
         };
     }
 
-
-
     exports.getWordBeforeCursor = getWordBeforeCursor;
     exports.handleSaveBtnClick = handleSaveBtnClick;
     exports.handleEditSaveBtnClick = handleEditSaveBtnClick;
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 5c4ff7f432..35dec54975 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -258,7 +258,16 @@ define(function (require, exports, module) {
         $snippetsPanel = $(snippetsPanelTpl);
         _addToMenu();
         CodeHintIntegration.init();
-        SnippetsState.loadSnippetsFromState();
+
+        // load snippets from file storage
+        SnippetsState.loadSnippetsFromState()
+            .then(function () {
+                //
+            })
+            .catch(function (error) {
+                console.error("failed to load custom snippets:", error);
+            });
+
         SnippetCursorManager.registerHandlers();
     });
 });
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index a8b6b94b2e..0d4f13d8ed 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -104,7 +104,9 @@ define(function (require, exports, module) {
         if (filterText) {
             $emptyMessage.text(`No snippets match "${filterText}"`);
         } else {
-            $emptyMessage.html('Add your own code hints to speed up coding - <a href="https://docs.phcode.dev" target="_blank">Learn More</a>');
+            $emptyMessage.html(
+                'Add your own code hints to speed up coding - <a href="https://docs.phcode.dev" target="_blank">Learn More</a>'
+            );
         }
     }
 
@@ -163,8 +165,16 @@ define(function (require, exports, module) {
 
         if (index !== -1) {
             Global.SnippetHintsList.splice(index, 1); // removes it from the actual array
-            // save to preferences after deleting snippet
-            SnippetsState.saveSnippetsToState();
+
+            // save to file storage
+            SnippetsState.saveSnippetsToState()
+                .then(function () {
+                    //
+                })
+                .catch(function (error) {
+                    console.error("failed to delete custom snippet correctly:", error);
+                });
+
             // update the snippets count in toolbar
             Helper.updateSnippetsCount();
             // Refresh the entire list to properly handle filtering
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 412a27f4b0..34d351e5d6 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -19,45 +19,61 @@
  */
 
 define(function (require, exports, module) {
-    const PreferencesManager = require("preferences/PreferencesManager");
-
     const Global = require("./global");
+    const PreferencesBase = require("preferences/PreferencesBase");
 
-    // create extension preferences
-    const prefs = PreferencesManager.getExtensionPrefs("CustomSnippets");
+    const SNIPPETS_FILE_PATH = brackets.app.getApplicationSupportDirectory() + "/customSnippets.json";
 
-    // define preference for storing snippets
-    prefs.definePreference("snippetsList", "array", [], {
-        description: "List of custom code snippets"
+    // the file storage for storing the snippets
+    const fileStorage = new PreferencesBase.FileStorage(SNIPPETS_FILE_PATH, {
+        snippets: []
     });
 
     /**
-     * Load snippets from preferences
-     * This is called on startup to restore previously saved snippets
+     * This function is responsible to load snippets from file storage
+     * @returns {Promise} a promise that resolves when snippets are loaded
      */
     function loadSnippetsFromState() {
-        try {
-            const savedSnippets = prefs.get("snippetsList");
-            if (Array.isArray(savedSnippets)) {
-                // clear existing snippets and load from saved state
-                Global.SnippetHintsList.length = 0;
-                Global.SnippetHintsList.push(...savedSnippets);
-            }
-        } catch (e) {
-            console.error("something went wrong when trying to load custom snippets from preferences:", e);
-        }
+        return new Promise((resolve, reject) => {
+            fileStorage
+                .load()
+                .done(function (data) {
+                    if (data && data.snippets && Array.isArray(data.snippets)) {
+                        Global.SnippetHintsList = data.snippets;
+                    } else {
+                        // no snippets are present
+                        Global.SnippetHintsList = [];
+                    }
+                    resolve();
+                })
+                .fail(function (error) {
+                    console.error("unable to load snippets from file storage:", error);
+                    Global.SnippetHintsList = []; // since it failed we init a empty array
+                    reject(error);
+                });
+        });
     }
 
     /**
-     * Save snippets to preferences
-     * This is called whenever snippets are modified
+     * this function is responsible to save snippets to file storage
+     * @returns {Promise} a promise that resolves when snippets are saved
      */
     function saveSnippetsToState() {
-        try {
-            prefs.set("snippetsList", [...Global.SnippetHintsList]);
-        } catch (e) {
-            console.error("something went wrong when saving custom snippets to preferences:", e);
-        }
+        return new Promise((resolve, reject) => {
+            const dataToSave = {
+                snippets: Global.SnippetHintsList
+            };
+
+            fileStorage
+                .save(dataToSave)
+                .done(() => {
+                    resolve();
+                })
+                .fail((error) => {
+                    console.error("unable to save snippets to file storage:", error);
+                    reject(error);
+                });
+        });
     }
 
     exports.loadSnippetsFromState = loadSnippetsFromState;

From 2a12fd3601983da313cca653cbb69e9cca750e50 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 23:03:08 +0530
Subject: [PATCH 22/43] feat: replace reset button with cancel button in the
 edit snippets panel

---
 .../CustomSnippets/driver.js                  | 19 +++++++----
 .../CustomSnippets/helper.js                  | 33 -------------------
 .../htmlContent/snippets-panel.html           |  2 +-
 .../CustomSnippets/main.js                    |  6 ++--
 4 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index 2b8ce27adf..93a3f6be9e 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -116,19 +116,24 @@ define(function (require, exports, module) {
     }
 
     /**
-     * This function handles the reset button click for editing a snippet
-     * It restores the original snippet data in the edit form
+     * This function is responsible to handle the cancel button click in the edit-snippet panel
+     * this resets the format to the last saved values and then moves back to the snippets-list panel
      */
-    function handleResetBtnClick() {
+    function handleCancelEditBtnClick() {
         const $editView = $("#custom-snippets-edit");
         const originalSnippet = $editView.data("originalSnippet");
 
         if (originalSnippet) {
-            // restore original data in the form
+            // restore original data in the form to reset any changes
             Helper.populateEditForm(originalSnippet);
-            // update save button state
-            Helper.toggleEditSaveButtonDisability();
         }
+
+        $editView.removeData("originalSnippet");
+        $editView.removeData("snippetIndex");
+
+        // navigate back to snippets list
+        UIHelper.showSnippetListMenu();
+        SnippetsList.showSnippetsList();
     }
 
     /**
@@ -183,5 +188,5 @@ define(function (require, exports, module) {
     exports.getWordBeforeCursor = getWordBeforeCursor;
     exports.handleSaveBtnClick = handleSaveBtnClick;
     exports.handleEditSaveBtnClick = handleEditSaveBtnClick;
-    exports.handleResetBtnClick = handleResetBtnClick;
+    exports.handleCancelEditBtnClick = handleCancelEditBtnClick;
 });
diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 379f48f318..5f0c015fe1 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -479,38 +479,6 @@ define(function (require, exports, module) {
         const hasAbbr = $abbrInput.val().trim().length > 0;
         const hasTemplate = $templateInput.val().trim().length > 0;
         $saveBtn.prop("disabled", !(hasAbbr && hasTemplate));
-
-        // Also toggle the reset button state
-        toggleResetButtonDisability();
-    }
-
-    /**
-     * This function checks if the snippet is in its default state and
-     * disables the reset button if it is
-     */
-    function toggleResetButtonDisability() {
-        const $editView = $("#custom-snippets-edit");
-        const originalSnippet = $editView.data("originalSnippet");
-        const $resetBtn = $("#reset-snippet-btn");
-
-        if (!originalSnippet) {
-            // If there's no original snippet data, disable the reset button
-            $resetBtn.prop("disabled", true);
-            return;
-        }
-
-        // Get current values from the form
-        const currentData = getEditSnippetData();
-
-        // Check if current values match original values
-        const isDefault =
-            currentData.abbreviation === originalSnippet.abbreviation &&
-            currentData.description === (originalSnippet.description || "") &&
-            currentData.templateText === originalSnippet.templateText &&
-            currentData.fileExtension === originalSnippet.fileExtension;
-
-        // Disable reset button if in default state
-        $resetBtn.prop("disabled", isDefault);
     }
 
     /**
@@ -884,7 +852,6 @@ define(function (require, exports, module) {
     exports.populateEditForm = populateEditForm;
     exports.getEditSnippetData = getEditSnippetData;
     exports.toggleEditSaveButtonDisability = toggleEditSaveButtonDisability;
-    exports.toggleResetButtonDisability = toggleResetButtonDisability;
     exports.clearEditInputFields = clearEditInputFields;
     exports.handleTextareaTabKey = handleTextareaTabKey;
     exports.validateAbbrInput = validateAbbrInput;
diff --git a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
index fd4c253f59..669da372cd 100644
--- a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
+++ b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
@@ -163,7 +163,7 @@
             </div>
 
             <div id="edit-snippet-buttons">
-                <button id="reset-snippet-btn" class="dialog-button btn">Reset</button>
+                <button id="cancel-edit-snippet-btn" class="dialog-button btn">Cancel</button>
                 <button id="save-edit-snippet-btn" class="dialog-button btn primary" disabled>Save</button>
             </div>
         </div>
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 35dec54975..7c95d84732 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -141,7 +141,7 @@ define(function (require, exports, module) {
         const $editTemplateInput = $("#edit-template-text-box");
         const $editFileExtnInput = $("#edit-file-extn-box");
         const $saveEditSnippetBtn = $("#save-edit-snippet-btn");
-        const $resetSnippetBtn = $("#reset-snippet-btn");
+        const $cancelEditSnippetBtn = $("#cancel-edit-snippet-btn");
 
         $addSnippetBtn.on("click", function () {
             UIHelper.showAddSnippetMenu();
@@ -237,8 +237,8 @@ define(function (require, exports, module) {
             Driver.handleEditSaveBtnClick();
         });
 
-        $resetSnippetBtn.on("click", function () {
-            Driver.handleResetBtnClick();
+        $cancelEditSnippetBtn.on("click", function () {
+            Driver.handleCancelEditBtnClick();
         });
 
         // filter input event handler

From ae5852660d7d6f3db4e134cec5430ae92680f128 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sat, 12 Jul 2025 23:31:47 +0530
Subject: [PATCH 23/43] fix: prevent processing file extension where two dots
 are there to support compound extensions

---
 .../CustomSnippets/helper.js                  | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 5f0c015fe1..1b78adaf5f 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -99,7 +99,7 @@ define(function (require, exports, module) {
      * This function is to make sure file extensions are properly formatted with leading dots
      * because user may provide values in not very consistent manner, we need to handle all those cases
      * For ex: what we expect: `.js, .html, .css`
-     * what user may provide: `js, html, css` or: `js html css` or `.js.html.css` etc
+     * what user may provide: `js, html, css` or: `js html css` etc
      *
      * This function processes file extensions in various formats and ensures they:
      * - Have a leading dot (if not empty or "all")
@@ -139,28 +139,12 @@ define(function (require, exports, module) {
                 .filter((ext) => ext !== "") // Remove empty entries
                 .join(", ");
         } else {
-            // Step 3: handle multiple extensions joined by dots (e.g., ".less.css.js")
-            // Only process if multiple dots exist and no commas
-            const dotCount = (extension.match(/\./g) || []).length;
-            if (dotCount > 1) {
-                // remove the leading dot if present for consistent processing
-                const extensionWithoutLeadingDot = extension.startsWith(".") ? extension.substring(1) : extension;
-
-                // split by dot, filter empty parts, add leading dot to each part
-                const parts = extensionWithoutLeadingDot
-                    .split(".")
-                    .filter((part) => part !== "")
-                    .map((part) => "." + part);
-
-                result = parts.join(", ");
+            // Step 3: Handle single extension
+            if (extension === ".") {
+                result = ""; // remove standalone dot
             } else {
-                // Step 4: Handle single extension
-                if (extension === ".") {
-                    result = ""; // remove standalone dot
-                } else {
-                    // Add leading dot if missing
-                    result = extension.startsWith(".") ? extension : "." + extension;
-                }
+                // Add leading dot if missing
+                result = extension.startsWith(".") ? extension : "." + extension;
             }
         }
 

From 589b6d16e5a87dccab2e654ba3ab2a2acb9d7f33 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sun, 13 Jul 2025 00:02:47 +0530
Subject: [PATCH 24/43] refactor: replace template with Click to edit template
 and so on

---
 .../CustomSnippets/snippetsList.js                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index 0d4f13d8ed..4d801151ed 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -45,12 +45,16 @@ define(function (require, exports, module) {
         const $snippetAbbr = $("<div>")
             .text(snippetItem.abbreviation)
             .attr("id", "snippet-abbr")
-            .attr("title", `Abbreviation: ${snippetItem.abbreviation}`);
+            .attr("title", `Click to edit abbreviation - ${snippetItem.abbreviation}`);
 
         const $snippetTemplate = $("<div>")
             .text(snippetItem.templateText)
             .attr("id", "snippet-template")
-            .attr("title", `Template: ${snippetItem.templateText}`);
+            .attr(
+                "title",
+                `Click to edit template text -
+${snippetItem.templateText}`
+            );
 
         const $snippetDescription = $("<div>")
             .text(
@@ -62,14 +66,14 @@ define(function (require, exports, module) {
             .attr(
                 "title",
                 snippetItem.description && snippetItem.description.trim() !== ""
-                    ? `Description: ${snippetItem.description}`
-                    : "No description provided"
+                    ? `Click to edit description - ${snippetItem.description}`
+                    : "Click to add description"
             );
 
         const $snippetFiles = $("<div>")
             .text(snippetItem.fileExtension || "all")
             .attr("id", "snippet-files")
-            .attr("title", `File extensions: ${snippetItem.fileExtension}`);
+            .attr("title", `Click to edit file extensions - ${snippetItem.fileExtension || "all"}`);
 
         const $deleteSnippet = $("<div>")
             .html(`<i class="fas fa-trash"></i>`)

From 8068629e14a0fffd2c5a1b087f04e080c4a7271e Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sun, 13 Jul 2025 14:31:21 +0530
Subject: [PATCH 25/43] refactor: store snippets directly in file instead of
 preferencesBase

---
 .../CustomSnippets/snippetsState.js           | 66 ++++++++++++-------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 34d351e5d6..050fd4a782 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -20,36 +20,50 @@
 
 define(function (require, exports, module) {
     const Global = require("./global");
-    const PreferencesBase = require("preferences/PreferencesBase");
+    const FileSystem = require("filesystem/FileSystem");
+    const FileUtils = require("file/FileUtils");
+    const FileSystemError = require("filesystem/FileSystemError");
 
     const SNIPPETS_FILE_PATH = brackets.app.getApplicationSupportDirectory() + "/customSnippets.json";
 
-    // the file storage for storing the snippets
-    const fileStorage = new PreferencesBase.FileStorage(SNIPPETS_FILE_PATH, {
-        snippets: []
-    });
-
     /**
      * This function is responsible to load snippets from file storage
      * @returns {Promise} a promise that resolves when snippets are loaded
      */
     function loadSnippetsFromState() {
         return new Promise((resolve, reject) => {
-            fileStorage
-                .load()
-                .done(function (data) {
-                    if (data && data.snippets && Array.isArray(data.snippets)) {
-                        Global.SnippetHintsList = data.snippets;
-                    } else {
-                        // no snippets are present
-                        Global.SnippetHintsList = [];
+            const file = FileSystem.getFileForPath(SNIPPETS_FILE_PATH);
+
+            // true is for bypassCache, to get the latest content always
+            const readPromise = FileUtils.readAsText(file, true);
+
+            readPromise
+                .done(function (text) {
+                    try {
+                        const data = JSON.parse(text);
+                        if (data && data.snippets && Array.isArray(data.snippets)) {
+                            Global.SnippetHintsList = data.snippets;
+                        } else {
+                            // no snippets are present
+                            Global.SnippetHintsList = [];
+                        }
+                        resolve();
+                    } catch (error) {
+                        console.error("Error parsing snippets JSON:", error);
+                        Global.SnippetHintsList = []; // fallback
+                        resolve();
                     }
-                    resolve();
                 })
                 .fail(function (error) {
-                    console.error("unable to load snippets from file storage:", error);
-                    Global.SnippetHintsList = []; // since it failed we init a empty array
-                    reject(error);
+                    if (error === FileSystemError.NOT_FOUND) {
+                        // file is not present, empty array
+                        Global.SnippetHintsList = [];
+                        resolve();
+                    } else {
+                        console.error("Unable to load snippets from file storage:", error);
+                        Global.SnippetHintsList = [];
+                        reject(error);
+                    }
                 });
         });
     }
@@ -64,13 +78,19 @@ define(function (require, exports, module) {
                 snippets: Global.SnippetHintsList
             };
 
-            fileStorage
-                .save(dataToSave)
-                .done(() => {
+            const file = FileSystem.getFileForPath(SNIPPETS_FILE_PATH);
+            // 2 is for pretty print
+            const jsonText = JSON.stringify(dataToSave, null, 2);
+
+            // true is allowBlindWrite to overwrite without checking file contents
+            const writePromise = FileUtils.writeText(file, jsonText, true);
+
+            writePromise
+                .done(function () {
                     resolve();
                 })
-                .fail((error) => {
-                    console.error("unable to save snippets to file storage:", error);
+                .fail(function (error) {
+                    console.error("Unable to save snippets to file storage:", error);
                     reject(error);
                 });
         });

From 206daed2b3ee9961fb44cf9c38dd6eb8049306d8 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Sun, 13 Jul 2025 14:50:07 +0530
Subject: [PATCH 26/43] fix: snippets 3 dots in the menu item was not
 consistent with the 3 dots in other menu items

---
 src/extensionsIntegrated/CustomSnippets/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 7c95d84732..720ce9aaca 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -40,7 +40,7 @@ define(function (require, exports, module) {
 
     const MY_COMMAND_ID = "custom_snippets";
     const PANEL_ID = "customSnippets.panel";
-    const MENU_ITEM_NAME = "Custom Snippets..."; // this name will appear as the menu item
+    const MENU_ITEM_NAME = "Custom Snippets\u2026"; // this name will appear as the menu item
     const PANEL_MIN_SIZE = 340; // the minimum size more than which its height cannot be decreased
 
     // this is to store the panel reference,

From 77a239100d28e505bf0631a34e64048c62d1cdf5 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 11:04:57 +0530
Subject: [PATCH 27/43] fix: remove redundant then blocks

---
 src/extensionsIntegrated/CustomSnippets/driver.js       | 6 ------
 src/extensionsIntegrated/CustomSnippets/main.js         | 3 ---
 src/extensionsIntegrated/CustomSnippets/snippetsList.js | 3 ---
 3 files changed, 12 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index 93a3f6be9e..4f8589454b 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -48,9 +48,6 @@ define(function (require, exports, module) {
 
             // save to file storage
             SnippetsState.saveSnippetsToState()
-                .then(function () {
-                    //
-                })
                 .catch(function (error) {
                     console.error("failed to save custom snippet correctly:", error);
                 });
@@ -98,9 +95,6 @@ define(function (require, exports, module) {
 
             // save to file storage
             SnippetsState.saveSnippetsToState()
-                .then(function () {
-                    //
-                })
                 .catch(function (error) {
                     console.error("failed to save custom snippet correctly:", error);
                 });
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 720ce9aaca..b77f47b156 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -261,9 +261,6 @@ define(function (require, exports, module) {
 
         // load snippets from file storage
         SnippetsState.loadSnippetsFromState()
-            .then(function () {
-                //
-            })
             .catch(function (error) {
                 console.error("failed to load custom snippets:", error);
             });
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index 4d801151ed..e559ad90fa 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -172,9 +172,6 @@ ${snippetItem.templateText}`
 
             // save to file storage
             SnippetsState.saveSnippetsToState()
-                .then(function () {
-                    //
-                })
                 .catch(function (error) {
                     console.error("failed to delete custom snippet correctly:", error);
                 });

From 8c502ab86a3caff25941630ef9f11447b103e249 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 11:18:01 +0530
Subject: [PATCH 28/43] fix: remove unnecessary pretty printing when saving
 file

---
 src/extensionsIntegrated/CustomSnippets/snippetsState.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 050fd4a782..795cdfb6f0 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -79,8 +79,7 @@ define(function (require, exports, module) {
             };
 
             const file = FileSystem.getFileForPath(SNIPPETS_FILE_PATH);
-            // 2 is for pretty print
-            const jsonText = JSON.stringify(dataToSave, null, 2);
+            const jsonText = JSON.stringify(dataToSave);
 
             // true is allowBlindWrite to overwrite without checking file contents
             const writePromise = FileUtils.writeText(file, jsonText, true);

From 2947c2daf4ab414f083b657c778de46f28abcad6 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 12:06:56 +0530
Subject: [PATCH 29/43] fix: directly return jsPromise for writeText instead of
 creating a new promise

---
 .../CustomSnippets/snippetsState.js           | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 795cdfb6f0..496b15d17c 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -18,6 +18,7 @@
  *
  */
 
+/* global jsPromise */
 define(function (require, exports, module) {
     const Global = require("./global");
     const FileSystem = require("filesystem/FileSystem");
@@ -73,26 +74,15 @@ define(function (require, exports, module) {
      * @returns {Promise} a promise that resolves when snippets are saved
      */
     function saveSnippetsToState() {
-        return new Promise((resolve, reject) => {
-            const dataToSave = {
-                snippets: Global.SnippetHintsList
-            };
-
-            const file = FileSystem.getFileForPath(SNIPPETS_FILE_PATH);
-            const jsonText = JSON.stringify(dataToSave);
+        const dataToSave = {
+            snippets: Global.SnippetHintsList
+        };
 
-            // true is allowBlindWrite to overwrite without checking file contents
-            const writePromise = FileUtils.writeText(file, jsonText, true);
+        const file = FileSystem.getFileForPath(SNIPPETS_FILE_PATH);
+        const jsonText = JSON.stringify(dataToSave);
 
-            writePromise
-                .done(function () {
-                    resolve();
-                })
-                .fail(function (error) {
-                    console.error("Unable to save snippets to file storage:", error);
-                    reject(error);
-                });
-        });
+        // true is allowBlindWrite to overwrite without checking file contents
+        return jsPromise(FileUtils.writeText(file, jsonText, true));
     }
 
     exports.loadSnippetsFromState = loadSnippetsFromState;

From d4491e1f78049cb500c39aa5a665b564ad23c694 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 12:22:55 +0530
Subject: [PATCH 30/43] feat: report unexpected errors to bugsnag

---
 src/extensionsIntegrated/CustomSnippets/driver.js        | 3 +++
 src/extensionsIntegrated/CustomSnippets/main.js          | 2 ++
 src/extensionsIntegrated/CustomSnippets/snippetsState.js | 7 ++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index 4f8589454b..242f226906 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -18,6 +18,7 @@
  *
  */
 
+/* global logger */
 define(function (require, exports, module) {
     const EditorManager = require("editor/EditorManager");
 
@@ -50,6 +51,7 @@ define(function (require, exports, module) {
             SnippetsState.saveSnippetsToState()
                 .catch(function (error) {
                     console.error("failed to save custom snippet correctly:", error);
+                    logger.reportError(error, "Custom Snippets: failed to save new snippet to file storage");
                 });
 
             // we need to move back to snippets list view after a snippet is saved
@@ -97,6 +99,7 @@ define(function (require, exports, module) {
             SnippetsState.saveSnippetsToState()
                 .catch(function (error) {
                     console.error("failed to save custom snippet correctly:", error);
+                    logger.reportError(error, "Custom Snippets: failed to save edited snippet to file storage");
                 });
 
             // clear the stored data
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index b77f47b156..53668dee32 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -19,6 +19,7 @@
  */
 
 /* eslint-disable no-invalid-this */
+/* global logger */
 define(function (require, exports, module) {
     const AppInit = require("utils/AppInit");
     const CommandManager = require("command/CommandManager");
@@ -263,6 +264,7 @@ define(function (require, exports, module) {
         SnippetsState.loadSnippetsFromState()
             .catch(function (error) {
                 console.error("failed to load custom snippets:", error);
+                logger.reportError(error, "Custom Snippets: didn't load on app init");
             });
 
         SnippetCursorManager.registerHandlers();
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 496b15d17c..2ba22da750 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -18,7 +18,7 @@
  *
  */
 
-/* global jsPromise */
+/* global jsPromise, logger */
 define(function (require, exports, module) {
     const Global = require("./global");
     const FileSystem = require("filesystem/FileSystem");
@@ -51,6 +51,10 @@ define(function (require, exports, module) {
                         resolve();
                     } catch (error) {
                         console.error("Error parsing snippets JSON:", error);
+                        logger.reportError(
+                            error,
+                            "Custom Snippets: Failed to parse snippets JSON file. File might be corrupted."
+                        );
                         Global.SnippetHintsList = []; // fallback
                         resolve();
                     }
@@ -62,6 +66,7 @@ define(function (require, exports, module) {
                         resolve();
                     } else {
                         console.error("Unable to load snippets from file storage:", error);
+                        logger.reportError(error, "Custom Snippets: unexpected file system error loading snippets");
                         Global.SnippetHintsList = [];
                         reject(error);
                     }

From 63d1a7bcd8264d961f95895ea0dc1667d5e78cc1 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 13:04:48 +0530
Subject: [PATCH 31/43] feat: move all strings to strings.js file

---
 .../CustomSnippets/UIHelper.js                |  3 +-
 .../CustomSnippets/helper.js                  | 20 ++---
 .../htmlContent/snippets-panel.html           | 74 +++++++++----------
 .../CustomSnippets/main.js                    |  8 +-
 .../CustomSnippets/snippetsList.js            | 23 +++---
 src/nls/root/strings.js                       | 42 ++++++++++-
 6 files changed, 103 insertions(+), 67 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/UIHelper.js b/src/extensionsIntegrated/CustomSnippets/UIHelper.js
index 51a14308d4..ffbf24f94d 100644
--- a/src/extensionsIntegrated/CustomSnippets/UIHelper.js
+++ b/src/extensionsIntegrated/CustomSnippets/UIHelper.js
@@ -21,6 +21,7 @@
 /* eslint-disable no-invalid-this */
 define(function (require, exports, module) {
     const Global = require("./global");
+    const Strings = require("strings");
 
     /**
      * this is a generic function to show error messages for input fields
@@ -187,7 +188,7 @@ define(function (require, exports, module) {
         const wrapperId = isEditForm ? "edit-abbr-box-wrapper" : "abbr-box-wrapper";
         const errorId = isEditForm ? "edit-abbreviation-duplicate-error" : "abbreviation-duplicate-error";
 
-        showError(inputId, wrapperId, `A snippet with abbreviation "${abbreviation}" already exists.`, errorId);
+        showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_DUPLICATE_ERROR.replace("{0}", abbreviation), errorId);
     }
 
     /**
diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 1b78adaf5f..d6276d9014 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -22,6 +22,7 @@ define(function (require, exports, module) {
     const StringMatch = require("utils/StringMatch");
     const Global = require("./global");
     const UIHelper = require("./UIHelper");
+    const Strings = require("strings");
 
     // list of all the navigation and function keys that are allowed inside the input fields
     const ALLOWED_NAVIGATION_KEYS = [
@@ -389,7 +390,7 @@ define(function (require, exports, module) {
         }
 
         // the codehints related style is written in brackets_patterns_override.less file
-        let $icon = $(`<a href="#" class="custom-snippet-code-hint" style="text-decoration: none">Snippet</a>`);
+        let $icon = $(`<a href="#" class="custom-snippet-code-hint" style="text-decoration: none">${Strings.CUSTOM_SNIPPETS_HINT_LABEL}</a>`);
         $hint.append($icon);
 
         if (description && description.trim() !== "") {
@@ -620,7 +621,7 @@ define(function (require, exports, module) {
             const wrapperId = isEditForm ? "edit-abbr-box-wrapper" : "abbr-box-wrapper";
             const errorId = isEditForm ? "edit-abbreviation-space-error" : "abbreviation-space-error";
 
-            UIHelper.showError(inputId, wrapperId, "Space is not accepted as a valid abbreviation character.", errorId);
+            UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_SPACE_ERROR, errorId);
             return;
         }
 
@@ -638,7 +639,7 @@ define(function (require, exports, module) {
             const wrapperId = isEditForm ? "edit-abbr-box-wrapper" : "abbr-box-wrapper";
             const errorId = isEditForm ? "edit-abbreviation-length-error" : "abbreviation-length-error";
 
-            UIHelper.showError(inputId, wrapperId, "Abbreviation cannot be more than 30 characters.", errorId);
+            UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_ABBR_LENGTH_ERROR, errorId);
         }
     }
 
@@ -667,7 +668,7 @@ define(function (require, exports, module) {
             const wrapperId = isEditForm ? "edit-desc-box-wrapper" : "desc-box-wrapper";
             const errorId = isEditForm ? "edit-description-length-error" : "description-length-error";
 
-            UIHelper.showError(inputId, wrapperId, "Description cannot be more than 80 characters.", errorId);
+            UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_DESC_LENGTH_ERROR, errorId);
         }
     }
 
@@ -730,15 +731,10 @@ define(function (require, exports, module) {
             // Prioritize length error over space error if both occurred
             if (wasTruncated) {
                 const errorId = isEditForm ? "edit-abbreviation-paste-length-error" : "abbreviation-paste-length-error";
-                UIHelper.showError(inputId, wrapperId, "Abbreviation cannot be more than 30 characters.", errorId);
+                UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_ABBR_LENGTH_ERROR, errorId);
             } else if (hadSpaces) {
                 const errorId = isEditForm ? "edit-abbreviation-paste-space-error" : "abbreviation-paste-space-error";
-                UIHelper.showError(
-                    inputId,
-                    wrapperId,
-                    "Space is not accepted as a valid abbreviation character.",
-                    errorId
-                );
+                UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_SPACE_ERROR, errorId);
             }
         }
 
@@ -806,7 +802,7 @@ define(function (require, exports, module) {
             const wrapperId = isEditForm ? "edit-desc-box-wrapper" : "desc-box-wrapper";
             const errorId = isEditForm ? "edit-description-paste-length-error" : "description-paste-length-error";
 
-            UIHelper.showError(inputId, wrapperId, "Description cannot be more than 80 characters.", errorId);
+            UIHelper.showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_DESC_LENGTH_ERROR, errorId);
         }
 
         // Determine which save button to toggle based on input field
diff --git a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
index 669da372cd..f1b5e3c0e2 100644
--- a/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
+++ b/src/extensionsIntegrated/CustomSnippets/htmlContent/snippets-panel.html
@@ -1,22 +1,22 @@
 <div id="custom-snippets-panel" class="custom-snippets-panel bottom-panel vert-resizable top-resizer no-focus">
     <div id="custom-snippets-toolbar" class="toolbar simple-toolbar-layout">
         <div class="title-wrapper">
-            <span class="title toolbar-title">Custom Snippets <span id="snippets-count" class="snippets-count"></span></span>
+            <span class="title toolbar-title">{{Strings.CUSTOM_SNIPPETS_PANEL_TITLE}} <span id="snippets-count" class="snippets-count"></span></span>
             <div id="add-new-snippet-btn" class="custom-snippet-btn">
-                <button title="Add new snippet">
+                <button title="{{Strings.CUSTOM_SNIPPETS_ADD_NEW_TITLE}}">
                     <i class="fas fa-plus"></i>
                 </button>
             </div>
             <div id="back-to-list-menu-btn" class="custom-snippet-btn hidden">
-                <button title="Back to snippets list">
+                <button title="{{Strings.CUSTOM_SNIPPETS_BACK_TO_LIST_TITLE}}">
                     <i class="back-btn-left-icon fas fa-chevron-left"></i>
-                    <span class="back-btn-text">Back</span>
+                    <span class="back-btn-text">{{Strings.CUSTOM_SNIPPETS_BACK}}</span>
                 </button>
             </div>
         </div>
         <div class="buttons">
             <div id="filter-snippets-panel" class="filter-snippets-panel">
-                <input id="filter-snippets-input" type="text" placeholder="Filter..." autocomplete="off" />
+                <input id="filter-snippets-input" type="text" placeholder="{{Strings.CUSTOM_SNIPPETS_FILTER_PLACEHOLDER}}" autocomplete="off" />
             </div>
             <a href="#" class="close" id="close-custom-snippets-panel-btn">&times;</a>
         </div>
@@ -26,17 +26,17 @@
         <!--this will display the list of all the already existing snippets-->
         <div id="custom-snippets-list" class="custom-snippes-list">
             <div id="no-snippets-wrapper" class="no-snippets-wrapper">
-                <div id="no-snippets-message">No custom snippets added yet!</div>
+                <div id="no-snippets-message">{{Strings.CUSTOM_SNIPPETS_NO_SNIPPETS_MESSAGE}}</div>
                 <div id="add-snippet-btn">
-                    <button>Add Snippet</button>
+                    <button>{{Strings.CUSTOM_SNIPPETS_ADD_SNIPPET_BTN}}</button>
                 </div>
             </div>
 
             <div id="snippets-list-header" class="snippets-list-header">
-                <div id="snippet-abbr-header">Abbreviation</div>
-                <div id="snippet-template-header">Template Text</div>
-                <div id="snippet-description-header">Description</div>
-                <div id="snippet-file-extension-header">File Extension</div>
+                <div id="snippet-abbr-header">{{Strings.CUSTOM_SNIPPETS_HEADER_ABBREVIATION}}</div>
+                <div id="snippet-template-header">{{Strings.CUSTOM_SNIPPETS_HEADER_TEMPLATE}}</div>
+                <div id="snippet-description-header">{{Strings.CUSTOM_SNIPPETS_HEADER_DESCRIPTION}}</div>
+                <div id="snippet-file-extension-header">{{Strings.CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION}}</div>
                 <div id="snippet-actions-header"></div>
             </div>
 
@@ -69,9 +69,9 @@
             <div id="abbr-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="abbr-box"
-                           title="Enter a short abbreviation (e.g., 'clg', 'fn', 'div'). This is what you'll type to trigger the snippet."
+                           title="{{Strings.CUSTOM_SNIPPETS_ABBR_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Abbreviation:
+                        {{Strings.CUSTOM_SNIPPETS_ABBREVIATION_LABEL}}
                     </label>
                     <input id="abbr-box" type="text" placeholder="clg" autocomplete="off" />
                 </div>
@@ -80,39 +80,39 @@
             <div id="desc-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="desc-box"
-                           title="Brief description of what this snippet does. Leave empty if no description needed."
+                           title="{{Strings.CUSTOM_SNIPPETS_DESC_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Description:
+                        {{Strings.CUSTOM_SNIPPETS_DESCRIPTION_LABEL}}
                     </label>
-                    <input id="desc-box" type="text" placeholder="console log shortcut (optional)" autocomplete="off" />
+                    <input id="desc-box" type="text" placeholder="{{Strings.CUSTOM_SNIPPETS_DESC_PLACEHOLDER}}" autocomplete="off" />
                 </div>
             </div>
 
             <div id="file-extn-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="file-extn-box"
-                           title="Specify file types where this snippet should be available (e.g., '.js', '.html', '.css'). Leave empty to make it available for all files."
+                           title="{{Strings.CUSTOM_SNIPPETS_FILE_EXT_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        File Extension:
+                        {{Strings.CUSTOM_SNIPPETS_FILE_EXTENSION_LABEL}}
                     </label>
-                    <input id="file-extn-box" type="text" placeholder="Leave empty for all files, or specify like .js, .html" autocomplete="off" />
+                    <input id="file-extn-box" type="text" placeholder="{{Strings.CUSTOM_SNIPPETS_FILE_EXT_PLACEHOLDER}}" autocomplete="off" />
                 </div>
             </div>
 
             <div id="template-text-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="template-text-box"
-                           title="The actual code that will be inserted. Use ${1}, ${2}, ${3}, etc. for cursor positions. ${1} is the initial position, tab moves to ${2}, ${3}, etc. ${0} is the final position."
+                           title="{{Strings.CUSTOM_SNIPPETS_TEMPLATE_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Template Text:
+                        {{Strings.CUSTOM_SNIPPETS_TEMPLATE_TEXT_LABEL}}
                     </label>
-                    <textarea id="template-text-box" placeholder="console.log(${1});" autocomplete="off"></textarea>
+                    <textarea id="template-text-box" placeholder="{{Strings.CUSTOM_SNIPPETS_TEMPLATE_PLACEHOLDER}}" autocomplete="off"></textarea>
                 </div>
             </div>
 
             <div id="add-custom-snippet-panel-buttons">
-                <button id="cancel-custom-snippet-btn" class="dialog-button btn">Cancel</button>
-                <button id="save-custom-snippet-btn" class="dialog-button btn primary" disabled>Save</button>
+                <button id="cancel-custom-snippet-btn" class="dialog-button btn">{{Strings.CUSTOM_SNIPPETS_CANCEL}}</button>
+                <button id="save-custom-snippet-btn" class="dialog-button btn primary" disabled>{{Strings.CUSTOM_SNIPPETS_SAVE}}</button>
             </div>
         </div>
 
@@ -121,9 +121,9 @@
             <div id="edit-abbr-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="edit-abbr-box"
-                           title="Enter a short abbreviation (e.g., 'clg', 'fn', 'div'). This is what you'll type to trigger the snippet."
+                           title="{{Strings.CUSTOM_SNIPPETS_ABBR_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Abbreviation:
+                        {{Strings.CUSTOM_SNIPPETS_ABBREVIATION_LABEL}}
                     </label>
                     <input id="edit-abbr-box" type="text" placeholder="clg" autocomplete="off" />
                 </div>
@@ -132,39 +132,39 @@
             <div id="edit-desc-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="edit-desc-box"
-                           title="Brief description of what this snippet does. Leave empty if no description needed."
+                           title="{{Strings.CUSTOM_SNIPPETS_DESC_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Description:
+                        {{Strings.CUSTOM_SNIPPETS_DESCRIPTION_LABEL}}
                     </label>
-                    <input id="edit-desc-box" type="text" placeholder="console log shortcut (optional)" autocomplete="off" />
+                    <input id="edit-desc-box" type="text" placeholder="{{Strings.CUSTOM_SNIPPETS_DESC_PLACEHOLDER}}" autocomplete="off" />
                 </div>
             </div>
 
             <div id="edit-file-extn-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="edit-file-extn-box"
-                           title="Specify file types where this snippet should be available (e.g., '.js', '.html', '.css'). Leave empty to make it available for all files."
+                           title="{{Strings.CUSTOM_SNIPPETS_FILE_EXT_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        File Extension:
+                        {{Strings.CUSTOM_SNIPPETS_FILE_EXTENSION_LABEL}}
                     </label>
-                    <input id="edit-file-extn-box" type="text" placeholder="Leave empty for all files, or specify like .js, .html" autocomplete="off" />
+                    <input id="edit-file-extn-box" type="text" placeholder="{{Strings.CUSTOM_SNIPPETS_FILE_EXT_PLACEHOLDER}}" autocomplete="off" />
                 </div>
             </div>
 
             <div id="edit-template-text-box-wrapper" class="field-wrapper">
                 <div class="field-row">
                     <label for="edit-template-text-box"
-                           title="The actual code that will be inserted. Use ${1}, ${2}, ${3}, etc. for cursor positions. ${1} is the initial position, tab moves to ${2}, ${3}, etc. ${0} is the final position."
+                           title="{{Strings.CUSTOM_SNIPPETS_TEMPLATE_INPUT_TOOLTIP}}"
                            data-placement="top">
-                        Template Text:
+                        {{Strings.CUSTOM_SNIPPETS_TEMPLATE_TEXT_LABEL}}
                     </label>
-                    <textarea id="edit-template-text-box" placeholder="console.log(${1});" autocomplete="off"></textarea>
+                    <textarea id="edit-template-text-box" placeholder="{{Strings.CUSTOM_SNIPPETS_TEMPLATE_PLACEHOLDER}}" autocomplete="off" />
                 </div>
             </div>
 
             <div id="edit-snippet-buttons">
-                <button id="cancel-edit-snippet-btn" class="dialog-button btn">Cancel</button>
-                <button id="save-edit-snippet-btn" class="dialog-button btn primary" disabled>Save</button>
+                <button id="cancel-edit-snippet-btn" class="dialog-button btn">{{Strings.CUSTOM_SNIPPETS_CANCEL}}</button>
+                <button id="save-edit-snippet-btn" class="dialog-button btn primary" disabled>{{Strings.CUSTOM_SNIPPETS_SAVE}}</button>
             </div>
         </div>
     </div>
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 53668dee32..1814c3fa80 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -26,6 +26,8 @@ define(function (require, exports, module) {
     const Menus = require("command/Menus");
     const Commands = require("command/Commands");
     const WorkspaceManager = require("view/WorkspaceManager");
+    const Strings = require("strings");
+    const Mustache = require("thirdparty/mustache/mustache");
 
     const Driver = require("./driver");
     const SnippetsList = require("./snippetsList");
@@ -41,7 +43,7 @@ define(function (require, exports, module) {
 
     const MY_COMMAND_ID = "custom_snippets";
     const PANEL_ID = "customSnippets.panel";
-    const MENU_ITEM_NAME = "Custom Snippets\u2026"; // this name will appear as the menu item
+    const MENU_ITEM_NAME = Strings.CUSTOM_SNIPPETS_MENU_ITEM_NAME; // this name will appear as the menu item
     const PANEL_MIN_SIZE = 340; // the minimum size more than which its height cannot be decreased
 
     // this is to store the panel reference,
@@ -256,7 +258,9 @@ define(function (require, exports, module) {
 
     AppInit.appReady(function () {
         CommandManager.register(MENU_ITEM_NAME, MY_COMMAND_ID, showCustomSnippetsPanel);
-        $snippetsPanel = $(snippetsPanelTpl);
+        // Render template with localized strings
+        const renderedHtml = Mustache.render(snippetsPanelTpl);
+        $snippetsPanel = $(renderedHtml);
         _addToMenu();
         CodeHintIntegration.init();
 
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index e559ad90fa..5b43b35ffd 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -30,6 +30,7 @@ define(function (require, exports, module) {
     const UIHelper = require("./UIHelper");
     const FilterSnippets = require("./filterSnippets");
     const Helper = require("./helper");
+    const Strings = require("strings");
 
     /**
      * This function is responsible to create a snippet item
@@ -45,35 +46,31 @@ define(function (require, exports, module) {
         const $snippetAbbr = $("<div>")
             .text(snippetItem.abbreviation)
             .attr("id", "snippet-abbr")
-            .attr("title", `Click to edit abbreviation - ${snippetItem.abbreviation}`);
+            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_ABBR_TOOLTIP.replace("{0}", snippetItem.abbreviation));
 
         const $snippetTemplate = $("<div>")
             .text(snippetItem.templateText)
             .attr("id", "snippet-template")
-            .attr(
-                "title",
-                `Click to edit template text -
-${snippetItem.templateText}`
-            );
+            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_TEMPLATE_TOOLTIP.replace("{0}", snippetItem.templateText));
 
         const $snippetDescription = $("<div>")
             .text(
                 snippetItem.description && snippetItem.description.trim() !== ""
                     ? snippetItem.description
-                    : "No description"
+                    : Strings.CUSTOM_SNIPPETS_NO_DESCRIPTION
             )
             .attr("id", "snippet-description")
             .attr(
                 "title",
                 snippetItem.description && snippetItem.description.trim() !== ""
-                    ? `Click to edit description - ${snippetItem.description}`
-                    : "Click to add description"
+                    ? Strings.CUSTOM_SNIPPETS_EDIT_DESC_TOOLTIP.replace("{0}", snippetItem.description)
+                    : Strings.CUSTOM_SNIPPETS_ADD_DESC_TOOLTIP
             );
 
         const $snippetFiles = $("<div>")
             .text(snippetItem.fileExtension || "all")
             .attr("id", "snippet-files")
-            .attr("title", `Click to edit file extensions - ${snippetItem.fileExtension || "all"}`);
+            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_FILE_EXT_TOOLTIP.replace("{0}", snippetItem.fileExtension || "all"));
 
         const $deleteSnippet = $("<div>")
             .html(`<i class="fas fa-trash"></i>`)
@@ -106,11 +103,9 @@ ${snippetItem.templateText}`
         const filterText = $filterInput.val().trim();
 
         if (filterText) {
-            $emptyMessage.text(`No snippets match "${filterText}"`);
+            $emptyMessage.text(Strings.CUSTOM_SNIPPETS_NO_MATCHES.replace("{0}", filterText));
         } else {
-            $emptyMessage.html(
-                'Add your own code hints to speed up coding - <a href="https://docs.phcode.dev" target="_blank">Learn More</a>'
-            );
+            $emptyMessage.html(Strings.CUSTOM_SNIPPETS_LEARN_MORE);
         }
     }
 
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index 9d3514aa5b..6025ed3611 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -1587,5 +1587,45 @@ define({
     "SIGN_OUT": "Sign out",
     "ACCOUNT_DETAILS": "Account Details",
     "AI_QUOTA_USED": "AI quota used",
-    "LOGIN_REFRESH": "Check Login Status"
+    "LOGIN_REFRESH": "Check Login Status",
+
+    // Custom Snippets
+    "CUSTOM_SNIPPETS_MENU_ITEM_NAME": "Custom Snippets\u2026",
+    "CUSTOM_SNIPPETS_PANEL_TITLE": "Custom Snippets",
+    "CUSTOM_SNIPPETS_ADD_NEW_TITLE": "Add new snippet",
+    "CUSTOM_SNIPPETS_BACK_TO_LIST_TITLE": "Back to snippets list",
+    "CUSTOM_SNIPPETS_BACK": "Back",
+    "CUSTOM_SNIPPETS_FILTER_PLACEHOLDER": "Filter...",
+    "CUSTOM_SNIPPETS_NO_SNIPPETS_MESSAGE": "No custom snippets added yet!",
+    "CUSTOM_SNIPPETS_ADD_SNIPPET_BTN": "Add Snippet",
+    "CUSTOM_SNIPPETS_ABBREVIATION_LABEL": "Abbreviation:",
+    "CUSTOM_SNIPPETS_TEMPLATE_TEXT_LABEL": "Template Text:",
+    "CUSTOM_SNIPPETS_DESCRIPTION_LABEL": "Description:",
+    "CUSTOM_SNIPPETS_FILE_EXTENSION_LABEL": "File Extension:",
+    "CUSTOM_SNIPPETS_CANCEL": "Cancel",
+    "CUSTOM_SNIPPETS_SAVE": "Save",
+    "CUSTOM_SNIPPETS_NO_DESCRIPTION": "No description",
+    "CUSTOM_SNIPPETS_NO_MATCHES": "No snippets match \"{0}\"",
+    "CUSTOM_SNIPPETS_LEARN_MORE": "Add your own code hints to speed up coding - <a href=\"https://docs.phcode.dev\" target=\"_blank\">Learn More</a>",
+    "CUSTOM_SNIPPETS_DUPLICATE_ERROR": "A snippet with abbreviation \"{0}\" already exists.",
+    "CUSTOM_SNIPPETS_SPACE_ERROR": "Space is not accepted as a valid abbreviation character.",
+    "CUSTOM_SNIPPETS_ABBR_LENGTH_ERROR": "Abbreviation cannot be more than 30 characters.",
+    "CUSTOM_SNIPPETS_DESC_LENGTH_ERROR": "Description cannot be more than 80 characters.",
+    "CUSTOM_SNIPPETS_HINT_LABEL": "Snippet",
+    "CUSTOM_SNIPPETS_EDIT_ABBR_TOOLTIP": "Click to edit abbreviation - {0}",
+    "CUSTOM_SNIPPETS_EDIT_TEMPLATE_TOOLTIP": "Click to edit template text -\n{0}",
+    "CUSTOM_SNIPPETS_EDIT_DESC_TOOLTIP": "Click to edit description - {0}",
+    "CUSTOM_SNIPPETS_ADD_DESC_TOOLTIP": "Click to add description",
+    "CUSTOM_SNIPPETS_EDIT_FILE_EXT_TOOLTIP": "Click to edit file extensions - {0}",
+    "CUSTOM_SNIPPETS_ABBR_INPUT_TOOLTIP": "Enter a short abbreviation (e.g., 'clg', 'fn', 'div'). This is what you'll type to trigger the snippet.",
+    "CUSTOM_SNIPPETS_DESC_INPUT_TOOLTIP": "Brief description of what this snippet does. Leave empty if no description needed.",
+    "CUSTOM_SNIPPETS_FILE_EXT_INPUT_TOOLTIP": "Specify file types where this snippet should be available (e.g., '.js', '.html', '.css'). Leave empty to make it available for all files.",
+    "CUSTOM_SNIPPETS_TEMPLATE_INPUT_TOOLTIP": "The actual code that will be inserted. Use ${1}, ${2}, ${3}, etc. for cursor positions. ${1} is the initial position, tab moves to ${2}, ${3}, etc. ${0} is the final position.",
+    "CUSTOM_SNIPPETS_DESC_PLACEHOLDER": "console log shortcut (optional)",
+    "CUSTOM_SNIPPETS_FILE_EXT_PLACEHOLDER": "Leave empty for all files, or specify like .js, .html",
+    "CUSTOM_SNIPPETS_TEMPLATE_PLACEHOLDER": "console.log(${1});",
+    "CUSTOM_SNIPPETS_HEADER_ABBREVIATION": "Abbreviation",
+    "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Template Text",
+    "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description",
+    "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension"
 });

From 81da0d5dd6a197d03b843c9f8af591a3946651bc Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 13:10:17 +0530
Subject: [PATCH 32/43] fix: strings in html not appearing

---
 src/extensionsIntegrated/CustomSnippets/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 1814c3fa80..9a8e3950f4 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -259,7 +259,7 @@ define(function (require, exports, module) {
     AppInit.appReady(function () {
         CommandManager.register(MENU_ITEM_NAME, MY_COMMAND_ID, showCustomSnippetsPanel);
         // Render template with localized strings
-        const renderedHtml = Mustache.render(snippetsPanelTpl);
+        const renderedHtml = Mustache.render(snippetsPanelTpl, {Strings: Strings});
         $snippetsPanel = $(renderedHtml);
         _addToMenu();
         CodeHintIntegration.init();

From 1350ded32eae4ee9dcfd82205c39f752b7fbe347 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 13:46:15 +0530
Subject: [PATCH 33/43] feat: add metrics to track snippets usage

---
 .../CustomSnippets/codeHintIntegration.js     |  5 ++++
 .../CustomSnippets/driver.js                  |  5 ++++
 .../CustomSnippets/helper.js                  | 24 +++++++++++++++++++
 .../CustomSnippets/main.js                    | 10 ++++++++
 .../CustomSnippets/snippetsList.js            |  6 +++++
 5 files changed, 50 insertions(+)

diff --git a/src/extensionsIntegrated/CustomSnippets/codeHintIntegration.js b/src/extensionsIntegrated/CustomSnippets/codeHintIntegration.js
index c970879b6f..9d4d1ee5f5 100644
--- a/src/extensionsIntegrated/CustomSnippets/codeHintIntegration.js
+++ b/src/extensionsIntegrated/CustomSnippets/codeHintIntegration.js
@@ -21,6 +21,7 @@
 define(function (require, exports, module) {
     const CodeHintManager = require("editor/CodeHintManager");
     const EditorManager = require("editor/EditorManager");
+    const Metrics = require("utils/Metrics");
 
     const Global = require("./global");
     const Driver = require("./driver");
@@ -118,6 +119,10 @@ define(function (require, exports, module) {
                         const editor = EditorManager.getFocusedEditor();
 
                         if (editor) {
+                            // to track the usage metrics
+                            const fileCategory = Helper.categorizeFileExtensionForMetrics(matchedSnippet.fileExtension);
+                            Metrics.countEvent(Metrics.EVENT_TYPE.EDITOR, "snipt", `use.${fileCategory}`);
+
                             // replace the typed abbreviation with the template text using cursor manager
                             const wordInfo = Driver.getWordBeforeCursor();
                             const start = { line: wordInfo.line, ch: wordInfo.ch + 1 };
diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index 242f226906..58ec05dd25 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -21,6 +21,7 @@
 /* global logger */
 define(function (require, exports, module) {
     const EditorManager = require("editor/EditorManager");
+    const Metrics = require("utils/Metrics");
 
     const Global = require("./global");
     const Helper = require("./helper");
@@ -47,6 +48,10 @@ define(function (require, exports, module) {
             Helper.clearAllInputFields();
             Helper.toggleSaveButtonDisability();
 
+            // snippet creating metrics
+            const fileCategory = Helper.categorizeFileExtensionForMetrics(snippetData.fileExtension);
+            Metrics.countEvent(Metrics.EVENT_TYPE.EDITOR, "snipt", `add.${fileCategory}`);
+
             // save to file storage
             SnippetsState.saveSnippetsToState()
                 .catch(function (error) {
diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index d6276d9014..2b4a0dcc0c 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -813,6 +813,29 @@ define(function (require, exports, module) {
         }
     }
 
+    /**
+     * Categorize file extension for metrics tracking
+     * @param {string} fileExtension - The file extension from snippet
+     * @returns {string} - Categorized extension for metrics
+     */
+    function categorizeFileExtensionForMetrics(fileExtension) {
+        if (!fileExtension || fileExtension === "all") {
+            return "all";
+        }
+
+        const ext = fileExtension.toLowerCase();
+        if (ext.includes(".js") || ext.includes(".ts")) {
+            return "js";
+        }
+        if (ext.includes("html") || ext.includes("htm")) {
+            return "html";
+        }
+        if (ext.includes("css") || ext.includes("less") || ext.includes("scss") || ext.includes("sass")) {
+            return "css";
+        }
+        return "other";
+    }
+
     exports.toggleSaveButtonDisability = toggleSaveButtonDisability;
     exports.createHintItem = createHintItem;
     exports.clearAllInputFields = clearAllInputFields;
@@ -832,6 +855,7 @@ define(function (require, exports, module) {
     exports.populateEditForm = populateEditForm;
     exports.getEditSnippetData = getEditSnippetData;
     exports.toggleEditSaveButtonDisability = toggleEditSaveButtonDisability;
+    exports.categorizeFileExtensionForMetrics = categorizeFileExtensionForMetrics;
     exports.clearEditInputFields = clearEditInputFields;
     exports.handleTextareaTabKey = handleTextareaTabKey;
     exports.validateAbbrInput = validateAbbrInput;
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 9a8e3950f4..7304833fa9 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -28,6 +28,7 @@ define(function (require, exports, module) {
     const WorkspaceManager = require("view/WorkspaceManager");
     const Strings = require("strings");
     const Mustache = require("thirdparty/mustache/mustache");
+    const Metrics = require("utils/Metrics");
 
     const Driver = require("./driver");
     const SnippetsList = require("./snippetsList");
@@ -36,6 +37,7 @@ define(function (require, exports, module) {
     const UIHelper = require("./UIHelper");
     const SnippetsState = require("./snippetsState");
     const SnippetCursorManager = require("./snippetCursorManager");
+    const Global = require("./global");
 
     const snippetsPanelTpl = require("text!./htmlContent/snippets-panel.html");
     // the html content of the panel will be stored in this variable
@@ -266,6 +268,14 @@ define(function (require, exports, module) {
 
         // load snippets from file storage
         SnippetsState.loadSnippetsFromState()
+            .then(function () {
+                // track boot-time snippet count (only if user has snippets)
+                const snippetCount = Global.SnippetHintsList.length;
+                if (snippetCount > 0) {
+                    const countRange = Metrics.getRangeName(snippetCount);
+                    Metrics.countEvent(Metrics.EVENT_TYPE.EDITOR, "snipt", `boot.${countRange}`);
+                }
+            })
             .catch(function (error) {
                 console.error("failed to load custom snippets:", error);
                 logger.reportError(error, "Custom Snippets: didn't load on app init");
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index 5b43b35ffd..113668a6d1 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -25,6 +25,8 @@
 
 /* eslint-disable no-invalid-this */
 define(function (require, exports, module) {
+    const Metrics = require("utils/Metrics");
+
     const Global = require("./global");
     const SnippetsState = require("./snippetsState");
     const UIHelper = require("./UIHelper");
@@ -163,6 +165,10 @@ define(function (require, exports, module) {
         const index = Global.SnippetHintsList.findIndex((s) => s.abbreviation === snippetItem.abbreviation);
 
         if (index !== -1) {
+            // track the snippet deletion metrics before removing
+            const fileCategory = Helper.categorizeFileExtensionForMetrics(snippetItem.fileExtension);
+            Metrics.countEvent(Metrics.EVENT_TYPE.EDITOR, "snipt", `del.${fileCategory}`);
+
             Global.SnippetHintsList.splice(index, 1); // removes it from the actual array
 
             // save to file storage

From 10ecd71ba1820710f699f68a0e803d703af8980d Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 20:28:48 +0530
Subject: [PATCH 34/43] fix: remove redundant console error as logger is
 already present

---
 src/extensionsIntegrated/CustomSnippets/driver.js        | 2 --
 src/extensionsIntegrated/CustomSnippets/main.js          | 1 -
 src/extensionsIntegrated/CustomSnippets/snippetsState.js | 2 --
 3 files changed, 5 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index 58ec05dd25..dd759cc717 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -55,7 +55,6 @@ define(function (require, exports, module) {
             // save to file storage
             SnippetsState.saveSnippetsToState()
                 .catch(function (error) {
-                    console.error("failed to save custom snippet correctly:", error);
                     logger.reportError(error, "Custom Snippets: failed to save new snippet to file storage");
                 });
 
@@ -103,7 +102,6 @@ define(function (require, exports, module) {
             // save to file storage
             SnippetsState.saveSnippetsToState()
                 .catch(function (error) {
-                    console.error("failed to save custom snippet correctly:", error);
                     logger.reportError(error, "Custom Snippets: failed to save edited snippet to file storage");
                 });
 
diff --git a/src/extensionsIntegrated/CustomSnippets/main.js b/src/extensionsIntegrated/CustomSnippets/main.js
index 7304833fa9..5e2b1b3d0f 100644
--- a/src/extensionsIntegrated/CustomSnippets/main.js
+++ b/src/extensionsIntegrated/CustomSnippets/main.js
@@ -277,7 +277,6 @@ define(function (require, exports, module) {
                 }
             })
             .catch(function (error) {
-                console.error("failed to load custom snippets:", error);
                 logger.reportError(error, "Custom Snippets: didn't load on app init");
             });
 
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 2ba22da750..7289cc93ad 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -50,7 +50,6 @@ define(function (require, exports, module) {
                         }
                         resolve();
                     } catch (error) {
-                        console.error("Error parsing snippets JSON:", error);
                         logger.reportError(
                             error,
                             "Custom Snippets: Failed to parse snippets JSON file. File might be corrupted."
@@ -65,7 +64,6 @@ define(function (require, exports, module) {
                         Global.SnippetHintsList = [];
                         resolve();
                     } else {
-                        console.error("Unable to load snippets from file storage:", error);
                         logger.reportError(error, "Custom Snippets: unexpected file system error loading snippets");
                         Global.SnippetHintsList = [];
                         reject(error);

From f280ab1f11a579187130a84b80629c25567b3154 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 20:35:28 +0530
Subject: [PATCH 35/43] fix: replace reject with resolve as reject might break
 boot

---
 src/extensionsIntegrated/CustomSnippets/snippetsState.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 7289cc93ad..2c5e14931e 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -66,7 +66,7 @@ define(function (require, exports, module) {
                     } else {
                         logger.reportError(error, "Custom Snippets: unexpected file system error loading snippets");
                         Global.SnippetHintsList = [];
-                        reject(error);
+                        resolve();
                     }
                 });
         });

From 3dc6e1df096db3395ba16c0fd14f3344e7853e2a Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 22:30:55 +0530
Subject: [PATCH 36/43] fix: instead of hard-coding file names use language
 manager

---
 .../CustomSnippets/helper.js                  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 2b4a0dcc0c..f018592ce5 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -20,6 +20,7 @@
 
 define(function (require, exports, module) {
     const StringMatch = require("utils/StringMatch");
+    const LanguageManager = require("language/LanguageManager");
     const Global = require("./global");
     const UIHelper = require("./UIHelper");
     const Strings = require("strings");
@@ -823,16 +824,26 @@ define(function (require, exports, module) {
             return "all";
         }
 
-        const ext = fileExtension.toLowerCase();
-        if (ext.includes(".js") || ext.includes(".ts")) {
-            return "js";
+        // get the first extension for categorization
+        const firstExt = fileExtension.split(",")[0].trim();
+
+        let language = LanguageManager.getLanguageForExtension(firstExt);
+        if (!language) {
+            return "other";
         }
-        if (ext.includes("html") || ext.includes("htm")) {
-            return "html";
+
+        let langId = language.getId();
+
+        if(["javascript", "typescript", "jsx", "tsx"].includes(langId)) {
+            return "js";
         }
-        if (ext.includes("css") || ext.includes("less") || ext.includes("scss") || ext.includes("sass")) {
+        if(["css", "scss", "less", "stylus"].includes(langId)) {
             return "css";
         }
+        if(["html", "ejs", "erb_html"].includes(langId)) {
+            return "html";
+        }
+
         return "other";
     }
 

From 76d6aaeadb40ab4f4893866c69e68607cc1602a1 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 22:39:50 +0530
Subject: [PATCH 37/43] fix: use stringUtils to replace strings

---
 src/extensionsIntegrated/CustomSnippets/UIHelper.js   |  3 ++-
 .../CustomSnippets/snippetsList.js                    | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/UIHelper.js b/src/extensionsIntegrated/CustomSnippets/UIHelper.js
index ffbf24f94d..1acf5c7bd9 100644
--- a/src/extensionsIntegrated/CustomSnippets/UIHelper.js
+++ b/src/extensionsIntegrated/CustomSnippets/UIHelper.js
@@ -20,6 +20,7 @@
 
 /* eslint-disable no-invalid-this */
 define(function (require, exports, module) {
+    const StringUtils = require("utils/StringUtils");
     const Global = require("./global");
     const Strings = require("strings");
 
@@ -188,7 +189,7 @@ define(function (require, exports, module) {
         const wrapperId = isEditForm ? "edit-abbr-box-wrapper" : "abbr-box-wrapper";
         const errorId = isEditForm ? "edit-abbreviation-duplicate-error" : "abbreviation-duplicate-error";
 
-        showError(inputId, wrapperId, Strings.CUSTOM_SNIPPETS_DUPLICATE_ERROR.replace("{0}", abbreviation), errorId);
+        showError(inputId, wrapperId, StringUtils.format(Strings.CUSTOM_SNIPPETS_DUPLICATE_ERROR, abbreviation), errorId);
     }
 
     /**
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index 113668a6d1..f287ab5e15 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -25,6 +25,7 @@
 
 /* eslint-disable no-invalid-this */
 define(function (require, exports, module) {
+    const StringUtils = require("utils/StringUtils");
     const Metrics = require("utils/Metrics");
 
     const Global = require("./global");
@@ -48,12 +49,12 @@ define(function (require, exports, module) {
         const $snippetAbbr = $("<div>")
             .text(snippetItem.abbreviation)
             .attr("id", "snippet-abbr")
-            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_ABBR_TOOLTIP.replace("{0}", snippetItem.abbreviation));
+            .attr("title", StringUtils.format(Strings.CUSTOM_SNIPPETS_EDIT_ABBR_TOOLTIP, snippetItem.abbreviation));
 
         const $snippetTemplate = $("<div>")
             .text(snippetItem.templateText)
             .attr("id", "snippet-template")
-            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_TEMPLATE_TOOLTIP.replace("{0}", snippetItem.templateText));
+            .attr("title", StringUtils.format(Strings.CUSTOM_SNIPPETS_EDIT_TEMPLATE_TOOLTIP, snippetItem.templateText));
 
         const $snippetDescription = $("<div>")
             .text(
@@ -65,14 +66,14 @@ define(function (require, exports, module) {
             .attr(
                 "title",
                 snippetItem.description && snippetItem.description.trim() !== ""
-                    ? Strings.CUSTOM_SNIPPETS_EDIT_DESC_TOOLTIP.replace("{0}", snippetItem.description)
+                    ? StringUtils.format(Strings.CUSTOM_SNIPPETS_EDIT_DESC_TOOLTIP, snippetItem.description)
                     : Strings.CUSTOM_SNIPPETS_ADD_DESC_TOOLTIP
             );
 
         const $snippetFiles = $("<div>")
             .text(snippetItem.fileExtension || "all")
             .attr("id", "snippet-files")
-            .attr("title", Strings.CUSTOM_SNIPPETS_EDIT_FILE_EXT_TOOLTIP.replace("{0}", snippetItem.fileExtension || "all"));
+            .attr("title", StringUtils.format(Strings.CUSTOM_SNIPPETS_EDIT_FILE_EXT_TOOLTIP, snippetItem.fileExtension || "all"));
 
         const $deleteSnippet = $("<div>")
             .html(`<i class="fas fa-trash"></i>`)
@@ -105,7 +106,7 @@ define(function (require, exports, module) {
         const filterText = $filterInput.val().trim();
 
         if (filterText) {
-            $emptyMessage.text(Strings.CUSTOM_SNIPPETS_NO_MATCHES.replace("{0}", filterText));
+            $emptyMessage.text(StringUtils.format(Strings.CUSTOM_SNIPPETS_NO_MATCHES, filterText));
         } else {
             $emptyMessage.html(Strings.CUSTOM_SNIPPETS_LEARN_MORE);
         }

From 818ef69c57e8e58fc8959f0d9c9262871dc5f21d Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Mon, 14 Jul 2025 22:44:24 +0530
Subject: [PATCH 38/43] fix: change cursor to pointer when close button for
 snippets panel is hovered

---
 src/styles/Extn-CustomSnippets.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/styles/Extn-CustomSnippets.less b/src/styles/Extn-CustomSnippets.less
index a90af44b61..57e6b32966 100644
--- a/src/styles/Extn-CustomSnippets.less
+++ b/src/styles/Extn-CustomSnippets.less
@@ -97,6 +97,10 @@
     padding-top: 2.5px;
 }
 
+#custom-snippets-panel .close:hover {
+    cursor: pointer;
+}
+
 .filter-snippets-panel {
     display: inline-block;
 }

From 9c0b25a4ec0f303e0cf7f8142012fae88669c437 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Tue, 15 Jul 2025 12:00:01 +0530
Subject: [PATCH 39/43] fix: return a "file" type if the snippet is enabled
 only for specific file type

---
 .../CustomSnippets/helper.js                  | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index f018592ce5..0bbef16da1 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -20,7 +20,6 @@
 
 define(function (require, exports, module) {
     const StringMatch = require("utils/StringMatch");
-    const LanguageManager = require("language/LanguageManager");
     const Global = require("./global");
     const UIHelper = require("./UIHelper");
     const Strings = require("strings");
@@ -817,34 +816,15 @@ define(function (require, exports, module) {
     /**
      * Categorize file extension for metrics tracking
      * @param {string} fileExtension - The file extension from snippet
-     * @returns {string} - Categorized extension for metrics
+     * @returns {string} - "all" if snippet is enabled for all files, otherwise "file"
      */
     function categorizeFileExtensionForMetrics(fileExtension) {
         if (!fileExtension || fileExtension === "all") {
             return "all";
         }
 
-        // get the first extension for categorization
-        const firstExt = fileExtension.split(",")[0].trim();
-
-        let language = LanguageManager.getLanguageForExtension(firstExt);
-        if (!language) {
-            return "other";
-        }
-
-        let langId = language.getId();
-
-        if(["javascript", "typescript", "jsx", "tsx"].includes(langId)) {
-            return "js";
-        }
-        if(["css", "scss", "less", "stylus"].includes(langId)) {
-            return "css";
-        }
-        if(["html", "ejs", "erb_html"].includes(langId)) {
-            return "html";
-        }
-
-        return "other";
+        // if not enabled for "all", we just return "file"
+        return "file";
     }
 
     exports.toggleSaveButtonDisability = toggleSaveButtonDisability;

From be92f9a9c2b3adb992a38f6cca5641702ccb334f Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Tue, 15 Jul 2025 13:18:56 +0530
Subject: [PATCH 40/43] fix: optimize the snippet code hints to prevent
 checking for hints on every keystroke

---
 .../CustomSnippets/driver.js                  |   2 +
 .../CustomSnippets/helper.js                  | 151 ++++++++++++++++--
 .../CustomSnippets/snippetsList.js            |   1 +
 .../CustomSnippets/snippetsState.js           |   6 +
 4 files changed, 143 insertions(+), 17 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/driver.js b/src/extensionsIntegrated/CustomSnippets/driver.js
index dd759cc717..9cec45b893 100644
--- a/src/extensionsIntegrated/CustomSnippets/driver.js
+++ b/src/extensionsIntegrated/CustomSnippets/driver.js
@@ -45,6 +45,7 @@ define(function (require, exports, module) {
 
         if (shouldAddSnippetToList(snippetData)) {
             Global.SnippetHintsList.push(snippetData);
+            Helper.rebuildOptimizedStructures();
             Helper.clearAllInputFields();
             Helper.toggleSaveButtonDisability();
 
@@ -98,6 +99,7 @@ define(function (require, exports, module) {
         // update the snippet in the list
         if (snippetIndex !== -1) {
             Global.SnippetHintsList[snippetIndex] = editedData;
+            Helper.rebuildOptimizedStructures();
 
             // save to file storage
             SnippetsState.saveSnippetsToState()
diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 0bbef16da1..cf0558ca7c 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -53,6 +53,77 @@ define(function (require, exports, module) {
         "F12"
     ];
 
+    // Optimized data structures for fast snippet lookups
+    let snippetsByLanguage = new Map();
+    let snippetsByAbbreviation = new Map();
+    let allSnippetsOptimized = [];
+
+    /**
+     * Preprocesses a snippet to add optimized lookup properties
+     * @param {Object} snippet - The original snippet object
+     * @returns {Object} - The snippet with added optimization properties
+     */
+    function preprocessSnippet(snippet) {
+        const optimizedSnippet = { ...snippet };
+
+        // pre-compute lowercase abbreviation for faster matching
+        optimizedSnippet.abbreviationLower = snippet.abbreviation.toLowerCase();
+
+        // parse and create a Set of supported extensions for O(1) lookup
+        if (snippet.fileExtension.toLowerCase() === "all") {
+            optimizedSnippet.supportedLangSet = new Set(["all"]);
+            optimizedSnippet.supportsAllLanguages = true;
+        } else {
+            const extensions = snippet.fileExtension
+                .toLowerCase()
+                .split(",")
+                .map(ext => ext.trim())
+                .filter(ext => ext);
+            optimizedSnippet.supportedLangSet = new Set(extensions);
+            optimizedSnippet.supportsAllLanguages = false;
+        }
+
+        return optimizedSnippet;
+    }
+
+    /**
+     * Rebuilds optimized data structures from the current snippet list
+     * we call this function whenever snippets are loaded, added, modified, or deleted
+     * i.e. whenever the snippetList is updated
+     */
+    function rebuildOptimizedStructures() {
+        // clear existing structures
+        snippetsByLanguage.clear();
+        snippetsByAbbreviation.clear();
+        allSnippetsOptimized.length = 0;
+
+        // Process each snippet
+        Global.SnippetHintsList.forEach(snippet => {
+            const optimizedSnippet = preprocessSnippet(snippet);
+            allSnippetsOptimized.push(optimizedSnippet);
+
+            // Index by abbreviation (lowercase) for exact matches
+            snippetsByAbbreviation.set(optimizedSnippet.abbreviationLower, optimizedSnippet);
+
+            // Index by supported languages/extensions
+            if (optimizedSnippet.supportsAllLanguages) {
+                // Add to a special "all" key for universal snippets
+                if (!snippetsByLanguage.has("all")) {
+                    snippetsByLanguage.set("all", new Set());
+                }
+                snippetsByLanguage.get("all").add(optimizedSnippet);
+            } else {
+                // Add to each supported extension
+                optimizedSnippet.supportedLangSet.forEach(ext => {
+                    if (!snippetsByLanguage.has(ext)) {
+                        snippetsByLanguage.set(ext, new Set());
+                    }
+                    snippetsByLanguage.get(ext).add(optimizedSnippet);
+                });
+            }
+        });
+    }
+
     /**
      * map the language IDs to their file extensions for snippet matching
      * this is needed because we expect the user to enter file extensions and not the file type inside the input field
@@ -237,12 +308,37 @@ define(function (require, exports, module) {
      * Checks if a snippet is supported in the given language context
      * Falls back to file extension matching if language mapping isn't available
      *
-     * @param {Object} snippet - The snippet object
+     * @param {Object} snippet - The snippet object (optimized or regular)
      * @param {string|null} languageContext - The current language context
      * @param {Editor} editor - The editor instance for fallback
      * @returns {boolean} - True if the snippet is supported
      */
     function isSnippetSupportedInLanguageContext(snippet, languageContext, editor) {
+        // first we need to try the optimizedSnippet
+        if (snippet.supportsAllLanguages !== undefined) {
+            if (snippet.supportsAllLanguages) {
+                return true;
+            }
+
+            if (languageContext) {
+                const effectiveExtension = mapLanguageToExtension(languageContext);
+                // if we have a proper mapping (starts with .), use language context matching
+                if (effectiveExtension.startsWith(".")) {
+                    return snippet.supportedLangSet.has(effectiveExtension);
+                }
+            }
+
+            // this is just a fallback if language context matching failed
+            // file extension matching
+            if (editor) {
+                const fileExtension = getCurrentFileExtension(editor);
+                return isSnippetSupportedInFile(snippet, fileExtension);
+            }
+
+            return false;
+        }
+
+        // for non-optimized snippets
         if (snippet.fileExtension.toLowerCase() === "all") {
             return true;
         }
@@ -303,12 +399,12 @@ define(function (require, exports, module) {
         const queryLower = query.toLowerCase();
         const languageContext = getCurrentLanguageContext(editor);
 
-        return Global.SnippetHintsList.some((snippet) => {
-            if (snippet.abbreviation.toLowerCase() === queryLower) {
-                return isSnippetSupportedInLanguageContext(snippet, languageContext, editor);
-            }
-            return false;
-        });
+        const snippet = snippetsByAbbreviation.get(queryLower);
+        if (snippet) {
+            return isSnippetSupportedInLanguageContext(snippet, languageContext, editor);
+        }
+
+        return false;
     }
 
     /**
@@ -321,21 +417,41 @@ define(function (require, exports, module) {
         const queryLower = query.toLowerCase();
         const languageContext = getCurrentLanguageContext(editor);
 
-        const matchingSnippets = Global.SnippetHintsList.filter((snippet) => {
-            if (snippet.abbreviation.toLowerCase().startsWith(queryLower)) {
-                return isSnippetSupportedInLanguageContext(snippet, languageContext, editor);
+        // Get the candidate snippets for the current language/extension
+        let candidateSnippets = new Set();
+
+        // Add universal snippets (support "all" languages)
+        const universalSnippets = snippetsByLanguage.get("all");
+        if (universalSnippets) {
+            universalSnippets.forEach(snippet => candidateSnippets.add(snippet));
+        }
+
+        // Add language-specific snippets
+        if (languageContext) {
+            const effectiveExtension = mapLanguageToExtension(languageContext);
+            if (effectiveExtension.startsWith(".")) {
+                const languageSnippets = snippetsByLanguage.get(effectiveExtension);
+                if (languageSnippets) {
+                    languageSnippets.forEach(snippet => candidateSnippets.add(snippet));
+                }
             }
-            return false;
+        }
+
+        // Fallback: if we can't determine language, check all snippets
+        if (candidateSnippets.size === 0) {
+            candidateSnippets = new Set(allSnippetsOptimized);
+        }
+
+        // Filter candidates by prefix match using pre-computed lowercase abbreviations
+        const matchingSnippets = Array.from(candidateSnippets).filter((snippet) => {
+            return snippet.abbreviationLower.startsWith(queryLower);
         });
 
         // sort snippets so that the exact matches will appear over the partial matches
         return matchingSnippets.sort((a, b) => {
-            const aLower = a.abbreviation.toLowerCase();
-            const bLower = b.abbreviation.toLowerCase();
-
             // check if either is an exact match
-            const aExact = aLower === queryLower;
-            const bExact = bLower === queryLower;
+            const aExact = a.abbreviationLower === queryLower;
+            const bExact = b.abbreviationLower === queryLower;
 
             // because exact matches appear first
             if (aExact && !bExact) {
@@ -345,7 +461,7 @@ define(function (require, exports, module) {
                 return 1;
             }
 
-            return aLower.localeCompare(bLower);
+            return a.abbreviationLower.localeCompare(b.abbreviationLower);
         });
     }
 
@@ -834,6 +950,7 @@ define(function (require, exports, module) {
     exports.getCurrentLanguageContext = getCurrentLanguageContext;
     exports.getCurrentFileExtension = getCurrentFileExtension;
     exports.mapLanguageToExtension = mapLanguageToExtension;
+    exports.rebuildOptimizedStructures = rebuildOptimizedStructures;
     exports.isSnippetSupportedInLanguageContext = isSnippetSupportedInLanguageContext;
     exports.isSnippetSupportedInFile = isSnippetSupportedInFile;
     exports.hasExactMatchingSnippet = hasExactMatchingSnippet;
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index f287ab5e15..b661044cc8 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -171,6 +171,7 @@ define(function (require, exports, module) {
             Metrics.countEvent(Metrics.EVENT_TYPE.EDITOR, "snipt", `del.${fileCategory}`);
 
             Global.SnippetHintsList.splice(index, 1); // removes it from the actual array
+            Helper.rebuildOptimizedStructures();
 
             // save to file storage
             SnippetsState.saveSnippetsToState()
diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsState.js b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
index 2c5e14931e..d3c5ad37e5 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsState.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsState.js
@@ -24,6 +24,7 @@ define(function (require, exports, module) {
     const FileSystem = require("filesystem/FileSystem");
     const FileUtils = require("file/FileUtils");
     const FileSystemError = require("filesystem/FileSystemError");
+    const Helper = require("./helper");
 
     const SNIPPETS_FILE_PATH = brackets.app.getApplicationSupportDirectory() + "/customSnippets.json";
 
@@ -48,6 +49,8 @@ define(function (require, exports, module) {
                             // no snippets are present
                             Global.SnippetHintsList = [];
                         }
+                        // rebuild the optimized data structures after loading snippets
+                        Helper.rebuildOptimizedStructures();
                         resolve();
                     } catch (error) {
                         logger.reportError(
@@ -55,6 +58,7 @@ define(function (require, exports, module) {
                             "Custom Snippets: Failed to parse snippets JSON file. File might be corrupted."
                         );
                         Global.SnippetHintsList = []; // fallback
+                        Helper.rebuildOptimizedStructures();
                         resolve();
                     }
                 })
@@ -62,10 +66,12 @@ define(function (require, exports, module) {
                     if (error === FileSystemError.NOT_FOUND) {
                         // file is not present, empty array
                         Global.SnippetHintsList = [];
+                        Helper.rebuildOptimizedStructures();
                         resolve();
                     } else {
                         logger.reportError(error, "Custom Snippets: unexpected file system error loading snippets");
                         Global.SnippetHintsList = [];
+                        Helper.rebuildOptimizedStructures();
                         resolve();
                     }
                 });

From d518c53ed695019efbcffd493769fddc30a3ad07 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Tue, 15 Jul 2025 13:35:13 +0530
Subject: [PATCH 41/43] fix: improve readability of
 isSnippetSupportedInLanguageContext function

---
 .../CustomSnippets/helper.js                  | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index cf0558ca7c..4d1a45a31d 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -314,51 +314,31 @@ define(function (require, exports, module) {
      * @returns {boolean} - True if the snippet is supported
      */
     function isSnippetSupportedInLanguageContext(snippet, languageContext, editor) {
-        // first we need to try the optimizedSnippet
-        if (snippet.supportsAllLanguages !== undefined) {
-            if (snippet.supportsAllLanguages) {
-                return true;
-            }
-
-            if (languageContext) {
-                const effectiveExtension = mapLanguageToExtension(languageContext);
-                // if we have a proper mapping (starts with .), use language context matching
-                if (effectiveExtension.startsWith(".")) {
-                    return snippet.supportedLangSet.has(effectiveExtension);
-                }
-            }
-
-            // this is just a fallback if language context matching failed
-            // file extension matching
-            if (editor) {
-                const fileExtension = getCurrentFileExtension(editor);
-                return isSnippetSupportedInFile(snippet, fileExtension);
-            }
-
-            return false;
-        }
-
-        // for non-optimized snippets
-        if (snippet.fileExtension.toLowerCase() === "all") {
+        // Check for "all" languages support (both optimized and non-optimized)
+        if (snippet.supportsAllLanguages === true || snippet.fileExtension?.toLowerCase() === "all") {
             return true;
         }
 
+        // Try language context matching if available
         if (languageContext) {
             const effectiveExtension = mapLanguageToExtension(languageContext);
 
             // if we have a proper mapping (starts with .), use language context matching
             if (effectiveExtension.startsWith(".")) {
+                // Use optimized path if available
+                if (snippet.supportedLangSet) {
+                    return snippet.supportedLangSet.has(effectiveExtension);
+                }
+                // Fallback for non-optimized snippets
                 const supportedExtensions = snippet.fileExtension
                     .toLowerCase()
                     .split(",")
                     .map((ext) => ext.trim());
-
                 return supportedExtensions.some((ext) => ext === effectiveExtension);
             }
         }
 
-        // this is just a fallback if language context matching failed
-        // file extension matching
+        // final fallback for file extension matching if language context matching failed
         if (editor) {
             const fileExtension = getCurrentFileExtension(editor);
             return isSnippetSupportedInFile(snippet, fileExtension);

From 862131d5fdd5e1276fa79177783e584c744343c6 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Tue, 15 Jul 2025 13:58:07 +0530
Subject: [PATCH 42/43] fix: remove redundant try catch block from
 getCurrentLanguageContext function

---
 src/extensionsIntegrated/CustomSnippets/helper.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 4d1a45a31d..95272ea8ff 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -280,15 +280,9 @@ define(function (require, exports, module) {
      * @returns {string|null} - The language ID or null if not available
      */
     function getCurrentLanguageContext(editor) {
-        // first try to get the language at cursor pos
-        // if it for some reason fails, then just go for the file extension
-        try {
-            const language = editor.getLanguageForPosition();
-            const languageId = language ? language.getId() : null;
-            return languageId;
-        } catch (e) {
-            return getCurrentFileExtension(editor);
-        }
+        const language = editor.getLanguageForPosition();
+        const languageId = language ? language.getId() : null;
+        return languageId;
     }
 
     /**

From d27e2b21c51310a3dc8c288949606019c0bdeb15 Mon Sep 17 00:00:00 2001
From: Pluto <devvaannsh@gmail.com>
Date: Tue, 15 Jul 2025 14:09:09 +0530
Subject: [PATCH 43/43] refactor: replace ?. with x && y

---
 src/extensionsIntegrated/CustomSnippets/helper.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/extensionsIntegrated/CustomSnippets/helper.js b/src/extensionsIntegrated/CustomSnippets/helper.js
index 95272ea8ff..f68dfe6294 100644
--- a/src/extensionsIntegrated/CustomSnippets/helper.js
+++ b/src/extensionsIntegrated/CustomSnippets/helper.js
@@ -309,7 +309,10 @@ define(function (require, exports, module) {
      */
     function isSnippetSupportedInLanguageContext(snippet, languageContext, editor) {
         // Check for "all" languages support (both optimized and non-optimized)
-        if (snippet.supportsAllLanguages === true || snippet.fileExtension?.toLowerCase() === "all") {
+        if (
+            snippet.supportsAllLanguages === true ||
+            (snippet.fileExtension && snippet.fileExtension.toLowerCase() === "all")
+        ) {
             return true;
         }