Commit d304922

author

Akos Kitta

committed

fix: escaped regex chars in pattern

Closes #1600 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

1 parent 8a85b5c commit d304922Copy full SHA for d304922

File tree

4 files changed

-15

lines changed

arduino-ide-extension
- package.json
- src
  - electron-main/theia
    - electron-main-application.ts
  - node
    - sketches-service-impl.ts
yarn.lock

4 files changed

-15

lines changed

`‎arduino-ide-extension/package.json‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@`
`45`	`45`	`"@types/deepmerge": "^2.2.0",`
`46`	`46`	`"@types/glob": "^7.2.0",`
`47`	`47`	`"@types/google-protobuf": "^3.7.2",`
`48`		`- "@types/is-valid-path": "^0.1.0",`
`49`	`48`	`"@types/js-yaml": "^3.12.2",`
`50`	`49`	`"@types/keytar": "^4.4.0",`
`51`	`50`	`"@types/lodash.debounce": "^4.0.6",`

`‎arduino-ide-extension/src/electron-main/theia/electron-main-application.ts‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ import {`
`27`	`27`	`CLOSE_PLOTTER_WINDOW,`
`28`	`28`	`SHOW_PLOTTER_WINDOW,`
`29`	`29`	`} from '../../common/ipc-communication';`
`30`		`-import isValidPath = require('is-valid-path');`
`31`	`30`
`32`	`31`	`app.commandLine.appendSwitch('disable-http-cache');`
`33`	`32`
`@@ -205,9 +204,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {`
`205`	`204`	`maybePath: string,`
`206`	`205`	`cwd: string`
`207`	`206`	`): Promise<string \| undefined> {`
`208`		`- if (!isValidPath(maybePath)) {`
`209`		`- return undefined;`
`210`		`- }`
`211`	`207`	`if (isAbsolute(maybePath)) {`
`212`	`208`	`return maybePath;`
`213`	`209`	`}`

`‎arduino-ide-extension/src/node/sketches-service-impl.ts‎`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import {`
`26`	`26`	`LoadSketchRequest,`
`27`	`27`	`} from './cli-protocol/cc/arduino/cli/commands/v1/commands_pb';`
`28`	`28`	`import { Deferred } from '@theia/core/lib/common/promise-util';`
	`29`	`+import { escapeRegExpCharacters } from '@theia/core/lib/common/strings';`
`29`	`30`	`import { ServiceError } from './service-error';`
`30`	`31`	`import {`
`31`	`32`	`IsTempSketch,`
`@@ -157,7 +158,7 @@ export class SketchesServiceImpl`
`157`	`158`	`const sketchName = segments[segments.length - 2];`
`158`	`159`	`const sketchFilename = segments[segments.length - 1];`
`159`	`160`	`const sketchFileExtension = segments[segments.length - 1].replace(`
`160`		`- new RegExp(sketchName),`
	`161`	`+ new RegExp(escapeRegExpCharacters(sketchName)),`
`161`	`162`	`''`
`162`	`163`	`);`
`163`	`164`	`if (sketchFileExtension !== '.ino' && sketchFileExtension !== '.pde') {`
`@@ -733,10 +734,12 @@ async function isInvalidSketchNameError(`
`733`	`734`	`if (ino) {`
`734`	`735`	`const sketchFolderPath = path.dirname(requestSketchPath);`
`735`	`736`	`const sketchName = path.basename(sketchFolderPath);`
`736`		- const pattern = `${invalidSketchNameErrorRegExpPrefix}${path.join(
`737`		`- sketchFolderPath,`
`738`		- `${sketchName}.ino`
`739`		- )}`.replace(/\\/g, '\\\\'); // make windows path separator with \\ to have a valid regexp.
	`737`	`+ const pattern = escapeRegExpCharacters(`
	`738`	+ `${invalidSketchNameErrorRegExpPrefix}${path.join(
	`739`	`+ sketchFolderPath,`
	`740`	+ `${sketchName}.ino`
	`741`	+ )}`
	`742`	`+ );`
`740`	`743`	`if (new RegExp(pattern, 'i').test(cliErr.details)) {`
`741`	`744`	`try {`
`742`	`745`	`await fs.access(requestSketchPath);`

`‎yarn.lock‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3118,11 +3118,6 @@`
`3118`	`3118`	`resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"`
`3119`	`3119`	`integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==`
`3120`	`3120`
`3121`		`-"@types/is-valid-path@^0.1.0":`
`3122`		`- version "0.1.0"`
`3123`		`- resolved "https://registry.yarnpkg.com/@types/is-valid-path/-/is-valid-path-0.1.0.tgz#d5c6e96801303112c9626d44268c6fabc72d272f"`
`3124`		`- integrity sha512-2ontWtpN8O2nf5S7EjDDJ0DwrRa2t7wmS3Wmo322yWYG6yFBYC1QCaLhz4Iz+mzJy8Kf4zP5yVyEd1ANPDmOFQ==`
`3125`		`-`
`3126`	`3121`	`"@types/js-yaml@^3.12.2":`
`3127`	`3122`	`version "3.12.7"`
`3128`	`3123`	`resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.7.tgz#330c5d97a3500e9c903210d6e49f02964af04a0e"`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit d304922

File tree

4 files changed

4 files changed

`‎arduino-ide-extension/package.json‎`

`‎arduino-ide-extension/src/electron-main/theia/electron-main-application.ts‎`

`‎arduino-ide-extension/src/node/sketches-service-impl.ts‎`

`‎yarn.lock‎`

0 commit comments