IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-22 08:46:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where double dollar quoted code is treated as string in syntax highlighter. #7294

Browse Source
This commit is contained in:
Aditya Toshniwal 2024-04-08 15:13:45 +05:30
parent fc4b419987
commit c9345ad618
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_8_6.rst
View File

@ -28,4 +28,5 @@ Housekeeping
Bug fixes Bug fixes
********* *********
| `Issue #7294 <https://github.com/pgadmin-org/pgadmin4/issues/7294>`_ - Fixed an issue where double dollar quoted code is treated as string in syntax highlighter.

2
web/package.json
View File

@ -76,7 +76,7 @@
"dependencies": { "dependencies": {
"@babel/plugin-proposal-class-properties": "^7.10.4", "@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/preset-react": "^7.12.13", "@babel/preset-react": "^7.12.13",
"@codemirror/lang-sql": "^6.6.2", "@codemirror/lang-sql": "^6.6.3",
"@date-io/core": "^1.3.6", "@date-io/core": "^1.3.6",
"@date-io/date-fns": "1.x", "@date-io/date-fns": "1.x",
"@emotion/sheet": "^1.0.1", "@emotion/sheet": "^1.0.1",

2
web/pgadmin/static/js/components/ReactCodeMirror/extensions/dialect.js
View File

@ -5,7 +5,7 @@ const keywords = PostgreSQL.spec.keywords.replace(/\b\w\b/, '') + ' ' + extraKey
const PgSQL = SQLDialect.define({ const PgSQL = SQLDialect.define({
charSetCasts: true, charSetCasts: true,
doubleDollarQuotedStrings: true, doubleDollarQuotedStrings: false,
operatorChars: '+-*/<>=~!@#%^&|`?', operatorChars: '+-*/<>=~!@#%^&|`?',
specialVar: '', specialVar: '',
keywords: keywords, keywords: keywords,

10
web/yarn.lock
View File

@ -2383,9 +2383,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@codemirror/lang-sql@npm:^6.6.2": "@codemirror/lang-sql@npm:^6.6.3":
version: 6.6.2 version: 6.6.3
resolution: "@codemirror/lang-sql@npm:6.6.2" resolution: "@codemirror/lang-sql@npm:6.6.3"
dependencies: dependencies:
"@codemirror/autocomplete": ^6.0.0 "@codemirror/autocomplete": ^6.0.0
"@codemirror/language": ^6.0.0 "@codemirror/language": ^6.0.0
@ -2393,7 +2393,7 @@ __metadata:
"@lezer/common": ^1.2.0 "@lezer/common": ^1.2.0
"@lezer/highlight": ^1.0.0 "@lezer/highlight": ^1.0.0
"@lezer/lr": ^1.0.0 "@lezer/lr": ^1.0.0
checksum: 664b20c65a8fa142f76baec7fe3c7c419e12ee89481fef0083917cc8640256af4945a9c82712ae67c6e96a5f2a46007e1dda8b3ce3d38d61d13da0ed116bcae9 checksum: b8e554bda9107107283674a6397cdb4816ad8bb429afd739fdc5e0339ef60170f09bdd93e7dc3eaf7f24ffaec5c7477ee42af7c05cb471990657014fac2fea1e
languageName: node languageName: node
linkType: hard linkType: hard
@ -14946,7 +14946,7 @@ __metadata:
"@babel/preset-env": ^7.10.2 "@babel/preset-env": ^7.10.2
"@babel/preset-react": ^7.12.13 "@babel/preset-react": ^7.12.13
"@babel/preset-typescript": ^7.22.5 "@babel/preset-typescript": ^7.22.5
"@codemirror/lang-sql": ^6.6.2 "@codemirror/lang-sql": ^6.6.3
"@date-io/core": ^1.3.6 "@date-io/core": ^1.3.6
"@date-io/date-fns": 1.x "@date-io/date-fns": 1.x
"@emotion/core": ^10.0.14 "@emotion/core": ^10.0.14