Skip to content

Commit ab7e25d

Browse files
chore: escape regex by own function
For: #62
1 parent 2a80cc6 commit ab7e25d

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"es6-promise": "^4.2.6",
3030
"es6-set": "^0.1.5",
3131
"escape-html": "^1.0.3",
32-
"escape-string-regexp": "^2.0.0",
3332
"fast-async": "7",
3433
"flatten": "^1.0.2",
3534
"github-markdown-css": "^3.0.1",

src/executable-code/executable-fragment.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import ExecutableCodeTemplate from './executable-fragment.monk';
77
import WebDemoApi from '../webdemo-api';
88
import TargetPlatform from "../target-platform";
99
import JsExecutor from "../js-executor"
10-
import {countLines, THEMES, unEscapeString} from "../utils";
10+
import {countLines, escapeRegExp, THEMES, unEscapeString} from "../utils";
1111
import debounce from 'debounce';
12-
import escapeStringRegexp from "escape-string-regexp"
1312
import CompletionView from "../view/completion-view";
1413
import {processErrors} from "../view/output-view";
1514

@@ -185,8 +184,8 @@ export default class ExecutableFragment extends ExecutableCodeTemplate {
185184
markPlaceHolders() {
186185
let taskRanges = this.getTaskRanges();
187186
this.codemirror.setValue(this.codemirror.getValue()
188-
.replace(new RegExp(escapeStringRegexp(MARK_PLACEHOLDER_OPEN), 'g'), "")
189-
.replace(new RegExp(escapeStringRegexp(MARK_PLACEHOLDER_CLOSE), 'g'), ""));
187+
.replace(new RegExp(escapeRegExp(MARK_PLACEHOLDER_OPEN), 'g'), "")
188+
.replace(new RegExp(escapeRegExp(MARK_PLACEHOLDER_CLOSE), 'g'), ""));
190189

191190
taskRanges.forEach(task => {
192191
this.codemirror.markText({line: task.line, ch: task.ch}, {line: task.line, ch: task.ch + task.length}, {

src/utils.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,10 @@ export function getCurrentScript() {
8383
}
8484

8585
/**
86-
* @return {boolean}
86+
* Use instead of @escape-string-regexp
8787
*/
88-
export function isEmbeddedFromCdn() {
89-
const currentScript = getCurrentScript();
90-
const src = currentScript.src ? currentScript.src : null;
91-
return src && src.indexOf(__CDN_URL__) !== -1;
88+
export function escapeRegExp(str) {
89+
return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
9290
}
9391

9492
/**

yarn.lock

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,10 +2339,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
23392339
version "1.0.5"
23402340
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
23412341

2342-
escape-string-regexp@^2.0.0:
2343-
version "2.0.0"
2344-
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
2345-
23462342
eslint-scope@^4.0.0:
23472343
version "4.0.3"
23482344
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"

0 commit comments

Comments
 (0)