extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-01-11 16:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #256 from brahma-dev/main

Browse Source 
Ensure that adjacent variables are rendered in separate spans.
This commit is contained in:
Anoop M D 2023-10-01 00:19:46 +05:30 committed by GitHub
commit 3c4ef2f2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/bruno-app/src/utils/codemirror/brunoVarInfo.js
View File

@ -66,8 +66,7 @@ if (!SERVER_RENDERED) {
if (target.nodeName !== 'SPAN' || state.hoverTimeout !== undefined) { if (target.nodeName !== 'SPAN' || state.hoverTimeout !== undefined) {
return; return;
} }
if (!target.classList.contains('cm-variable-valid')) {
if (target.className !== 'cm-variable-valid') {
return; return;
} }

5
packages/bruno-app/src/utils/common/codemirror.js
View File

@ -25,10 +25,11 @@ export const defineCodeMirrorBrunoVariablesMode = (variables, mode) => {
stream.eat('}'); stream.eat('}');
let found = pathFoundInVariables(word, variables); let found = pathFoundInVariables(word, variables);
if (found) { if (found) {
return 'variable-valid'; return 'variable-valid random-' + (Math.random() + 1).toString(36).substring(9);
} else { } else {
return 'variable-invalid'; return 'variable-invalid random-' + (Math.random() + 1).toString(36).substring(9);
} }
// Random classname added so adjacent variables are not rendered in the same SPAN by CodeMirror.
} }
word += ch; word += ch;
} }