btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'hoppscotch:main' into codeday/main

Browse Source
This commit is contained in:
Jason Jock Nava Casareno
2022-08-08 17:28:25 -07:00
committed by GitHub
parent fb5967294b a9e1a3002e
commit abba09ea80
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/hoppscotch-app/helpers/editor/extensions/HoppEnvironment.ts
View File

@@ -16,7 +16,7 @@ import {
getAggregateEnvs, getAggregateEnvs,
} from "~/newstore/environments" } from "~/newstore/environments"
const HOPP_ENVIRONMENT_REGEX = /(<<\w+>>)/g const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
const HOPP_ENV_HIGHLIGHT = const HOPP_ENV_HIGHLIGHT =
"cursor-help transition rounded px-1 focus:outline-none mx-0.5 env-highlight" "cursor-help transition rounded px-1 focus:outline-none mx-0.5 env-highlight"
@@ -44,8 +44,9 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
let start = pos let start = pos
let end = pos let end = pos
while (start > from && /\w/.test(text[start - from - 1])) start-- while (start > from && /[a-zA-Z0-9-_]+/.test(text[start - from - 1]))
while (end < to && /\w/.test(text[end - from])) end++ start--
while (end < to && /[a-zA-Z0-9-_]+/.test(text[end - from])) end++
if ( if (
(start === pos && side < 0) || (start === pos && side < 0) ||