From 6714bb114c5fb5fb56cffa3f7ac20261ac461d8e Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Fri, 13 Jun 2025 16:55:54 +0530
Subject: [PATCH] Fixed an issue in SQL syntax highlighting where the same
 color was used for both variable names and datatypes. #8235

---
 docs/en_US/release_notes_9_5.rst             | 2 ++
 web/pgadmin/static/js/Theme/dark.js          | 2 +-
 web/pgadmin/static/js/Theme/high_contrast.js | 2 +-
 web/pgadmin/static/js/Theme/light.js         | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/en_US/release_notes_9_5.rst b/docs/en_US/release_notes_9_5.rst
index fec17b954..bcbad57be 100644
--- a/docs/en_US/release_notes_9_5.rst
+++ b/docs/en_US/release_notes_9_5.rst
@@ -22,6 +22,7 @@ New features
 
   | `Issue #1926 <https://github.com/pgadmin-org/pgadmin4/issues/1926>`_ -  Add a new permission to allow disabling "Change Password" feature for a pgAdmin role.
   | `Issue #1947 <https://github.com/pgadmin-org/pgadmin4/issues/1947>`_ -  Added role-based restrictions for editing server connections.
+  | `Issue #2659 <https://github.com/pgadmin-org/pgadmin4/issues/2659>`_ -  Added support for customizing keyboard shortcuts in the Query Tool's Edit menu.
   | `Issue #2864 <https://github.com/pgadmin-org/pgadmin4/issues/2864>`_ -  Add a search box to enable searching within the preferences tab.
   | `Issue #3319 <https://github.com/pgadmin-org/pgadmin4/issues/3319>`_ -  Added support to preserve the workspace, query windows, and pgAdmin state during an abrupt shutdown or restart.
   | `Issue #6743 <https://github.com/pgadmin-org/pgadmin4/issues/6743>`_ -  Open preferences in a new tab instead of a dialog for better user experience.
@@ -37,6 +38,7 @@ Bug fixes
   | `Issue #6118 <https://github.com/pgadmin-org/pgadmin4/issues/6118>`_ -  Improved PL/pgSQL code folding and support nested blocks.
   | `Issue #7466 <https://github.com/pgadmin-org/pgadmin4/issues/7466>`_ -  Fixed an issue where utilities such as pg_dump and pg_restore failed to log error messages when required dependency files were missing.
   | `Issue #8032 <https://github.com/pgadmin-org/pgadmin4/issues/8032>`_ -  Fixed an issue where the Schema Diff Tool incorrectly reported differences due to variations in the order of the privileges.
+  | `Issue #8235 <https://github.com/pgadmin-org/pgadmin4/issues/8235>`_ -  Fixed an issue in SQL syntax highlighting where the same color was used for both variable names and datatypes.
   | `Issue #8691 <https://github.com/pgadmin-org/pgadmin4/issues/8691>`_ -  Fixed an issue in the query tool where using multiple cursors to copy text resulted in only the first line being copied.
   | `Issue #8808 <https://github.com/pgadmin-org/pgadmin4/issues/8808>`_ -  Fixed an issue where data export using a query opened the wrong dialog type.
   | `Issue #8809 <https://github.com/pgadmin-org/pgadmin4/issues/8809>`_ -  Fixed an issue where data export using a query failed when the query contained a newline character.
diff --git a/web/pgadmin/static/js/Theme/dark.js b/web/pgadmin/static/js/Theme/dark.js
index 5013403b8..7b6f733f2 100644
--- a/web/pgadmin/static/js/Theme/dark.js
+++ b/web/pgadmin/static/js/Theme/dark.js
@@ -133,7 +133,7 @@ export default function(basicSettings) {
         number: '#7fcc5c',
         string: '#e4e487',
         variable: '#7dc9f1',
-        type: '#7dc9f1',
+        type: '#BBBB2A',
         comment: '#7fcc5c',
         punctuation: '#d6aaaa',
         operator: '#d6aaaa',
diff --git a/web/pgadmin/static/js/Theme/high_contrast.js b/web/pgadmin/static/js/Theme/high_contrast.js
index aa62e3a6d..79a4e4df4 100644
--- a/web/pgadmin/static/js/Theme/high_contrast.js
+++ b/web/pgadmin/static/js/Theme/high_contrast.js
@@ -131,7 +131,7 @@ export default function(basicSettings) {
         number: '#45D48A',
         string: '#EAEA43',
         variable: '#7DC9F1',
-        type: '#7DC9F1',
+        type: '#BBBB2A',
         comment: '#FFAD65',
         punctuation: '#d6aaaa',
         operator: '#d6aaaa',
diff --git a/web/pgadmin/static/js/Theme/light.js b/web/pgadmin/static/js/Theme/light.js
index d99b8231a..68a28abce 100644
--- a/web/pgadmin/static/js/Theme/light.js
+++ b/web/pgadmin/static/js/Theme/light.js
@@ -154,7 +154,7 @@ export default function(basicSettings) {
         number: '#964',
         string: '#a11',
         variable: '#222',
-        type: '#05a',
+        type: '#7e0000',
         comment: '#a50',
         punctuation: '#737373',
         operator: '#222',