jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-27 05:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue when checking if a sketch is temp

Browse Source 
convert all windows drive letters to lower case. [ATL-380]

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2020-08-10 13:46:36 +02:00
parent aa2bed8d39
commit bc4c3e04f5
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arduino-ide-extension/src/common/utils.ts
View File

@ -3,3 +3,7 @@ export const naturalCompare: (left: string, right: string) => number = require('
export function notEmpty(arg: string | undefined | null): arg is string { export function notEmpty(arg: string | undefined | null): arg is string {
return !!arg; return !!arg;
} }
export function firstToLowerCase(what: string): string {
return what.charAt(0).toLowerCase() + what.slice(1);
}

19
arduino-ide-extension/src/node/sketches-service-impl.ts
View File

@ -6,15 +6,19 @@ import { ncp } from 'ncp';
import { Stats } from 'fs'; import { Stats } from 'fs';
import * as fs from './fs-extra'; import * as fs from './fs-extra';
import URI from '@theia/core/lib/common/uri'; import URI from '@theia/core/lib/common/uri';
import { isWindows } from '@theia/core/lib/common/os';
import { FileUri, BackendApplicationContribution } from '@theia/core/lib/node'; import { FileUri, BackendApplicationContribution } from '@theia/core/lib/node';
import { ConfigService } from '../common/protocol/config-service'; import { ConfigService } from '../common/protocol/config-service';
import { SketchesService, Sketch } from '../common/protocol/sketches-service'; import { SketchesService, Sketch } from '../common/protocol/sketches-service';
import { firstToLowerCase } from '../common/utils';
// As currently implemented on Linux, // As currently implemented on Linux,
// the maximum number of symbolic links that will be followed while resolving a pathname is 40 // the maximum number of symbolic links that will be followed while resolving a pathname is 40
const MAX_FILESYSTEM_DEPTH = 40; const MAX_FILESYSTEM_DEPTH = 40;
const WIN32_DRIVE_REGEXP = /^[a-zA-Z]:\\/;
// TODO: `fs`: use async API // TODO: `fs`: use async API
@injectable() @injectable()
export class SketchesServiceImpl implements SketchesService, BackendApplicationContribution { export class SketchesServiceImpl implements SketchesService, BackendApplicationContribution {
@ -330,8 +334,19 @@ void loop() {
} }
async isTemp(sketch: Sketch): Promise<boolean> { async isTemp(sketch: Sketch): Promise<boolean> {
const sketchPath = FileUri.fsPath(sketch.uri); let sketchPath = FileUri.fsPath(sketch.uri);
return sketchPath.indexOf('.arduinoProIDE-unsaved') !== -1 && sketchPath.startsWith(os.tmpdir()); let temp = os.tmpdir();
// Note: VS Code URI normalizes the drive letter. `C:` will be converted into `c:`.
// https://github.com/Microsoft/vscode/issues/68325#issuecomment-462239992
if (isWindows) {
if (WIN32_DRIVE_REGEXP.exec(sketchPath)) {
sketchPath = firstToLowerCase(sketchPath);
}
if (WIN32_DRIVE_REGEXP.exec(temp)) {
temp = firstToLowerCase(temp);
}
}
return sketchPath.indexOf('.arduinoProIDE-unsaved') !== -1 && sketchPath.startsWith(temp);
} }
async copy(sketch: Sketch, { destinationUri }: { destinationUri: string }): Promise<string> { async copy(sketch: Sketch, { destinationUri }: { destinationUri: string }): Promise<string> {