Commit 1dc7a89

Akos Kittakittaakos

Akos Kitta

authored and

committed

ATL-935: Better support for opening large projects

Signed-off-by: Akos Kitta <kittaakos@typefox.io>

1 parent 1280a34 commit 1dc7a89Copy full SHA for 1dc7a89

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut`
`314`	`314`	`protected async openSketchFiles(uri: URI): Promise<void> {`
`315`	`315`	`try {`
`316`	`316`	`const sketch = await this.sketchService.loadSketch(uri.toString());`
`317`		`- const { mainFileUri, otherSketchFileUris, additionalFileUris } = sketch;`
`318`		`- for (const uri of [mainFileUri, ...otherSketchFileUris, ...additionalFileUris]) {`
	`317`	`+ const { mainFileUri, rootFolderFileUris } = sketch;`
	`318`	`+ for (const uri of [mainFileUri, ...rootFolderFileUris]) {`
`319`	`319`	`await this.ensureOpened(uri);`
`320`	`320`	`}`
`321`	`321`	`await this.ensureOpened(mainFileUri, true);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ export class SketchControl extends SketchContribution {`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`
`43`		`- const { mainFileUri, otherSketchFileUris, additionalFileUris } = await this.sketchService.loadSketch(sketch.uri);`
`44`		`- const uris = [mainFileUri, ...otherSketchFileUris, ...additionalFileUris];`
	`43`	`+ const { mainFileUri, rootFolderFileUris } = await this.sketchService.loadSketch(sketch.uri);`
	`44`	`+ const uris = [mainFileUri, ...rootFolderFileUris];`
`45`	`45`	`for (let i = 0; i < uris.length; i++) {`
`46`	`46`	`const uri = new URI(uris[i]);`
`47`	`47`	const command = { id: `arduino-focus-file--${uri.toString()}` };

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ export interface Sketch {`
`71`	`71`	readonly mainFileUri: string; // `MainFile`
`72`	`72`	readonly otherSketchFileUris: string[]; // `OtherSketchFiles`
`73`	`73`	readonly additionalFileUris: string[]; // `AdditionalFiles`
	`74`	+ readonly rootFolderFileUris: string[]; // `RootFolderFiles` (does not include the main sketch file)
`74`	`75`	`}`
`75`	`76`	`export namespace Sketch {`
`76`	`77`	`export function is(arg: any): arg is Sketch {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ export class SketchesServiceImpl implements SketchesService {`
`94`	`94`	`mainFileUri: FileUri.create(resp.getMainFile()).toString(),`
`95`	`95`	`otherSketchFileUris: resp.getOtherSketchFilesList().map(p => FileUri.create(p).toString()),`
`96`	`96`	`additionalFileUris: resp.getAdditionalFilesList().map(p => FileUri.create(p).toString()),`
	`97`	`+ rootFolderFileUris: resp.getRootFolderFilesList().map(p => FileUri.create(p).toString()),`
`97`	`98`	`mtimeMs`
`98`	`99`	`});`
`99`	`100`	`});`

Comments

(0)