Commit 846c22c

fstasiAlberto Iannaccone

and

Alberto Iannaccone

authored

Theia 18 hotfixes (#528)

* Restore monaco suggestion highlights * remove duplicated tabs on startup * fix rename and delete sketch * remove '.only(...)' in tests Co-authored-by: Alberto Iannaccone <a.iannaccone@arduino.cc>

1 parent fc0f674 commit 846c22cCopy full SHA for 846c22c

File tree

4 files changed

+44

-10

lines changed

arduino-ide-extension/src
- browser
  - contributions
    - sketch-control.ts
  - style
    - editor.css
  - theia/core
    - shell-layout-restorer.ts
- test/browser
  - monitor-utils.test.ts

4 files changed

+44

-10

lines changed

`‎arduino-ide-extension/src/browser/contributions/sketch-control.ts‎`

Lines changed: 13 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ export class SketchControl extends SketchContribution {`
`87`	`87`	`currentSketch &&`
`88`	`88`	`parentsketch &&`
`89`	`89`	`parentsketch.uri === currentSketch.uri &&`
`90`		`- (awaitthis.allowRename(parentsketch.uri))`
	`90`	`+ this.allowRename(parentsketch.uri)`
`91`	`91`	`) {`
`92`	`92`	`this.menuRegistry.registerMenuAction(`
`93`	`93`	`ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,`
`@@ -124,7 +124,7 @@ export class SketchControl extends SketchContribution {`
`124`	`124`	`currentSketch &&`
`125`	`125`	`parentsketch &&`
`126`	`126`	`parentsketch.uri === currentSketch.uri &&`
`127`		`- (awaitthis.allowDelete(parentsketch.uri))`
	`127`	`+ this.allowDelete(parentsketch.uri)`
`128`	`128`	`) {`
`129`	`129`	`this.menuRegistry.registerMenuAction(`
`130`	`130`	`ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,`
`@@ -249,20 +249,24 @@ export class SketchControl extends SketchContribution {`
`249`	`249`	`});`
`250`	`250`	`}`
`251`	`251`
`252`		`- protected async isCloudSketch(uri: string) {`
`253`		`- const cloudCacheLocation = this.localCacheFsProvider.from(new URI(uri));`
	`252`	`+ protected isCloudSketch(uri: string): boolean {`
	`253`	`+ try {`
	`254`	`+ const cloudCacheLocation = this.localCacheFsProvider.from(new URI(uri));`
`254`	`255`
`255`		`- if (cloudCacheLocation) {`
`256`		`- return true;`
	`256`	`+ if (cloudCacheLocation) {`
	`257`	`+ return true;`
	`258`	`+ }`
	`259`	`+ return false;`
	`260`	`+ } catch {`
	`261`	`+ return false;`
`257`	`262`	`}`
`258`		`- return false;`
`259`	`263`	`}`
`260`	`264`
`261`		`- protected asyncallowRename(uri: string) {`
	`265`	`+ protected allowRename(uri: string): boolean {`
`262`	`266`	`return !this.isCloudSketch(uri);`
`263`	`267`	`}`
`264`	`268`
`265`		`- protected asyncallowDelete(uri: string) {`
	`269`	`+ protected allowDelete(uri: string): boolean {`
`266`	`270`	`return !this.isCloudSketch(uri);`
`267`	`271`	`}`
`268`	`272`	`}`

`‎arduino-ide-extension/src/browser/style/editor.css‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,7 @@`
`4`	`4`	`background-size: 13px;`
`5`	`5`	`background-image: var(--theia-icon-circle);`
`6`	`6`	`}`
	`7`	`+`
	`8`	`+.monaco-list-row.show-file-icons.focused {`
	`9`	`+ background-color: #d6ebff;`
	`10`	`+}`

`‎arduino-ide-extension/src/browser/theia/core/shell-layout-restorer.ts‎`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,30 @@ export class ShellLayoutRestorer extends TheiaShellLayoutRestorer {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+ async restoreLayout(app: FrontendApplication): Promise<boolean> {`
	`27`	`+ this.logger.info('>>> Restoring the layout state...');`
	`28`	`+ const serializedLayoutData = await this.storageService.getData<string>(`
	`29`	`+ this.storageKey`
	`30`	`+ );`
	`31`	`+ if (serializedLayoutData === undefined) {`
	`32`	`+ this.logger.info('<<< Nothing to restore.');`
	`33`	`+ return false;`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ const layoutData = await this.inflate(serializedLayoutData);`
	`37`	`+ // workaround to remove duplicated tabs`
	`38`	`+ if ((layoutData as any)?.mainPanel?.main?.widgets) {`
	`39`	`+ (layoutData as any).mainPanel.main.widgets = (`
	`40`	`+ layoutData as any`
	`41`	`+ ).mainPanel.main.widgets.filter(`
	`42`	`+ (widget: any) =>`
	`43`	`+ widget.constructionOptions.factoryId !== 'code-editor-opener'`
	`44`	`+ );`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ await app.shell.setLayoutData(layoutData);`
	`48`	`+ this.logger.info('<<< The layout has been successfully restored.');`
	`49`	`+ return true;`
	`50`	`+ }`
`25`	`51`	`}`

`‎arduino-ide-extension/src/test/browser/monitor-utils.test.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ testLines.forEach((t) =>`
`125`	`125`	`)`
`126`	`126`	`);`
`127`	`127`
`128`		`-describe.only('Monitor Utils', () => {`
	`128`	`+describe('Monitor Utils', () => {`
`129`	`129`	`beforeEach(() => {`
`130`	`130`	`set(date);`
`131`	`131`	`});`

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 846c22c

File tree

4 files changed

4 files changed

`‎arduino-ide-extension/src/browser/contributions/sketch-control.ts‎`

`‎arduino-ide-extension/src/browser/style/editor.css‎`

`‎arduino-ide-extension/src/browser/theia/core/shell-layout-restorer.ts‎`

`‎arduino-ide-extension/src/test/browser/monitor-utils.test.ts‎`

0 commit comments