Update Theia, CLI and LS (#610)

* Update Theia to 1.19.0

* update CLI to 0.20.0-rc3

* Add language selector to settings

* updated language server and vscode-arduino-tools

* update Language Server flags

* get cli port from config

* force native menu on windows

* pinned Language Server to rc2

* fix search icon

* update CLI version

arduino-ide-extension/package.json

@@ -21,22 +21,22 @@
   "dependencies": {
     "arduino-serial-plotter-webapp": "0.0.15",   
     "@grpc/grpc-js": "^1.3.7",
-    "@theia/application-package": "1.18.0",
-    "@theia/core": "1.18.0",
-    "@theia/editor": "1.18.0",
-    "@theia/editor-preview": "1.18.0",
-    "@theia/filesystem": "1.18.0",
-    "@theia/git": "1.18.0",
-    "@theia/keymaps": "1.18.0",
-    "@theia/markers": "1.18.0",
-    "@theia/monaco": "1.18.0",
-    "@theia/navigator": "1.18.0",
-    "@theia/outline-view": "1.18.0",
-    "@theia/output": "1.18.0",
-    "@theia/preferences": "1.18.0",
-    "@theia/search-in-workspace": "1.18.0",
-    "@theia/terminal": "1.18.0",
-    "@theia/workspace": "1.18.0",
+    "@theia/application-package": "1.19.0",
+    "@theia/core": "1.19.0",
+    "@theia/editor": "1.19.0",
+		"@theia/editor-preview": "1.19.0",
+    "@theia/filesystem": "1.19.0",
+    "@theia/git": "1.19.0",
+    "@theia/keymaps": "1.19.0",
+    "@theia/markers": "1.19.0",
+    "@theia/monaco": "1.19.0",
+    "@theia/navigator": "1.19.0",
+    "@theia/outline-view": "1.19.0",
+    "@theia/output": "1.19.0",
+    "@theia/preferences": "1.19.0",
+    "@theia/search-in-workspace": "1.19.0",
+    "@theia/terminal": "1.19.0",
+    "@theia/workspace": "1.19.0",
     "@tippyjs/react": "^4.2.5",
     "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
@@ -149,7 +149,7 @@
   ],
   "arduino": {
     "cli": {
-      "version": "0.20.0"
+      "version": "0.20.1"
     },
     "fwuploader": {
       "version": "2.0.0"

arduino-ide-extension/scripts/download-ls.js

@@ -4,69 +4,78 @@
 // - https://downloads.arduino.cc/arduino-language-server/clangd/clangd_${VERSION}_${SUFFIX}
 
 (() => {
+  const DEFAULT_ALS_VERSION = '0.5.0-rc2';
+  const DEFAULT_CLANGD_VERSION = 'snapshot_20210124';
 
-    const DEFAULT_ALS_VERSION = 'nightly';
-    const DEFAULT_CLANGD_VERSION = 'snapshot_20210124';
+  const path = require('path');
+  const shell = require('shelljs');
+  const downloader = require('./downloader');
 
-    const path = require('path');
-    const shell = require('shelljs');
-    const downloader = require('./downloader');
+  const yargs = require('yargs')
+    .option('ls-version', {
+      alias: 'lv',
+      default: DEFAULT_ALS_VERSION,
+      describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_ALS_VERSION}.`,
+    })
+    .option('clangd-version', {
+      alias: 'cv',
+      default: DEFAULT_CLANGD_VERSION,
+      choices: ['snapshot_20210124'],
+      describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`,
+    })
+    .option('force-download', {
+      alias: 'fd',
+      default: false,
+      describe: `If set, this script force downloads the 'arduino-language-server' even if it already exists on the file system.`,
+    })
+    .version(false)
+    .parse();
 
-    const yargs = require('yargs')
-        .option('ls-version', {
-            alias: 'lv',
-            default: DEFAULT_ALS_VERSION,
-            choices: ['nightly'],
-            describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_ALS_VERSION}.`
-        })
-        .option('clangd-version', {
-            alias: 'cv',
-            default: DEFAULT_CLANGD_VERSION,
-            choices: ['snapshot_20210124'],
-            describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`
-        })
-        .option('force-download', {
-            alias: 'fd',
-            default: false,
-            describe: `If set, this script force downloads the 'arduino-language-server' even if it already exists on the file system.`
-        })
-        .version(false).parse();
+  const alsVersion = yargs['ls-version'];
+  const clangdVersion = yargs['clangd-version'];
+  const force = yargs['force-download'];
+  const { platform, arch } = process;
 
-    const alsVersion = yargs['ls-version'];
-    const clangdVersion = yargs['clangd-version']
-    const force = yargs['force-download'];
-    const { platform, arch } = process;
+  const build = path.join(__dirname, '..', 'build');
+  const lsExecutablePath = path.join(
+    build,
+    `arduino-language-server${platform === 'win32' ? '.exe' : ''}`
+  );
 
-    const build = path.join(__dirname, '..', 'build');
-    const lsExecutablePath = path.join(build, `arduino-language-server${platform === 'win32' ? '.exe' : ''}`);
+  let clangdExecutablePath, lsSuffix, clangdPrefix;
+  switch (platform) {
+    case 'darwin':
+      clangdExecutablePath = path.join(build, 'bin', 'clangd');
+      lsSuffix = 'macOS_64bit.tar.gz';
+      clangdPrefix = 'mac';
+      break;
+    case 'linux':
+      clangdExecutablePath = path.join(build, 'bin', 'clangd');
+      lsSuffix = 'Linux_64bit.tar.gz';
+      clangdPrefix = 'linux';
+      break;
+    case 'win32':
+      clangdExecutablePath = path.join(build, 'bin', 'clangd.exe');
+      lsSuffix = 'Windows_64bit.zip';
+      clangdPrefix = 'windows';
+      break;
+  }
+  if (!lsSuffix) {
+    shell.echo(
+      `The arduino-language-server is not available for ${platform} ${arch}.`
+    );
+    shell.exit(1);
+  }
 
-    let clangdExecutablePath, lsSuffix, clangdPrefix;
-    switch (platform) {
-        case 'darwin':
-            clangdExecutablePath = path.join(build, 'bin', 'clangd')
-            lsSuffix = 'macOS_amd64.zip';
-            clangdPrefix = 'mac';
-            break;
-        case 'linux':
-            clangdExecutablePath = path.join(build, 'bin', 'clangd')
-            lsSuffix = 'Linux_amd64.zip';
-            clangdPrefix = 'linux'
-            break;
-        case 'win32':
-            clangdExecutablePath = path.join(build, 'bin', 'clangd.exe')
-            lsSuffix = 'Windows_amd64.zip';
-            clangdPrefix = 'windows';
-            break;
-    }
-    if (!lsSuffix) {
-        shell.echo(`The arduino-language-server is not available for ${platform} ${arch}.`);
-        shell.exit(1);
-    }
-
-    const alsUrl = `https://downloads.arduino.cc/arduino-language-server/${alsVersion === 'nightly' ? 'nightly/arduino-language-server' : 'arduino-language-server_' + alsVersion}_${lsSuffix}`;
-    downloader.downloadUnzipAll(alsUrl, build, lsExecutablePath, force);
-
-    const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd-${clangdPrefix}-${clangdVersion}.zip`;
-    downloader.downloadUnzipAll(clangdUrl, build, clangdExecutablePath, force, { strip: 1 }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
+  const alsUrl = `https://downloads.arduino.cc/arduino-language-server/${
+    alsVersion === 'nightly'
+      ? 'nightly/arduino-language-server'
+      : 'arduino-language-server_' + alsVersion
+  }_${lsSuffix}`;
+  downloader.downloadUnzipAll(alsUrl, build, lsExecutablePath, force);
 
+  const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd-${clangdPrefix}-${clangdVersion}.zip`;
+  downloader.downloadUnzipAll(clangdUrl, build, clangdExecutablePath, force, {
+    strip: 1,
+  }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
 })();

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -1,3 +1,13 @@
+import { inject, injectable, postConstruct } from 'inversify';
+import * as React from 'react';
+import { remote } from 'electron';
+import {
+  BoardsService,
+  Port,
+  SketchesService,
+  ExecutableService,
+  Sketch,
+} from '../common/protocol';
 import { Mutex } from 'async-mutex';
 import {
   MAIN_MENU_BAR,
@@ -13,7 +23,7 @@ import {
   StatusBar,
   StatusBarAlignment,
 } from '@theia/core/lib/browser';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
@@ -40,16 +50,10 @@ import { OutputContribution } from '@theia/output/lib/browser/output-contributio
 import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
 import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-import { inject, injectable, postConstruct } from 'inversify';
-import * as React from 'react';
-import { remote } from 'electron';
-import {
-  BoardsService,
-  Port,
-  SketchesService,
-  ExecutableService,
-  Sketch,
-} from '../common/protocol';
+import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { FileChangeType } from '@theia/filesystem/lib/browser';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { ConfigService } from '../common/protocol/config-service';
 import { ArduinoCommands } from './arduino-commands';
 import { BoardsConfig } from './boards/boards-config';
@@ -60,13 +64,9 @@ import { EditorMode } from './editor-mode';
 import { ArduinoMenus } from './menu/arduino-menus';
 import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
-import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { ArduinoPreferences } from './arduino-preferences';
 import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { SaveAsSketch } from './contributions/save-as-sketch';
-import { FileChangeType } from '@theia/filesystem/lib/browser';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
 
 const INIT_AVR_PACKAGES = 'initializedAvrPackages';
@@ -340,15 +340,14 @@ export class ArduinoFrontendContribution
           );
         }
       }
-      const { clangdUri, cliUri, lsUri } = await this.executableService.list();
-      const [clangdPath, cliPath, lsPath, cliConfigPath] = await Promise.all([
+      const { clangdUri, lsUri } = await this.executableService.list();
+      const [clangdPath, lsPath] = await Promise.all([
         this.fileService.fsPath(new URI(clangdUri)),
-        this.fileService.fsPath(new URI(cliUri)),
         this.fileService.fsPath(new URI(lsUri)),
-        this.fileService.fsPath(
-          new URI(await this.configService.getCliConfigFileUri())
-        ),
       ]);
+
+      const config = await this.configService.getConfiguration();
+
       this.languageServerFqbn = await Promise.race([
         new Promise<undefined>((_, reject) =>
           setTimeout(
@@ -360,10 +359,10 @@ export class ArduinoFrontendContribution
           'arduino.languageserver.start',
           {
             lsPath,
-            cliPath,
+            cliDaemonAddr: `localhost:${config.daemon.port}`,
             clangdPath,
             log: currentSketchPath ? currentSketchPath : log,
-            cliConfigPath,
+            cliDaemonInstance: '1',
             board: {
               fqbn,
               name: name ? `"${name}"` : undefined,

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -154,7 +154,7 @@ import {
 } from '../common/protocol/examples-service';
 import { BuiltInExamples, LibraryExamples } from './contributions/examples';
 import { IncludeLibrary } from './contributions/include-library';
-import { OutputChannelManager as TheiaOutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputChannelManager as TheiaOutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { OutputChannelManager } from './theia/output/output-channel';
 import {
   OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl,
@@ -190,12 +190,12 @@ import { BoardSelection } from './contributions/board-selection';
 import { OpenRecentSketch } from './contributions/open-recent-sketch';
 import { Help } from './contributions/help';
 import { bindArduinoPreferences } from './arduino-preferences';
+import { SettingsService } from './dialogs/settings/settings';
 import {
-  SettingsService,
   SettingsDialog,
   SettingsWidget,
   SettingsDialogProps,
-} from './settings';
+} from './dialogs/settings/settings-dialog';
 import { AddFile } from './contributions/add-file';
 import { ArchiveSketch } from './contributions/archive-sketch';
 import { OutputToolbarContribution as TheiaOutputToolbarContribution } from '@theia/output/lib/browser/output-toolbar-contribution';
@@ -207,6 +207,8 @@ import { DebugConfigurationManager } from './theia/debug/debug-configuration-man
 import { DebugConfigurationManager as TheiaDebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
 import { SearchInWorkspaceWidget as TheiaSearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
 import { SearchInWorkspaceWidget } from './theia/search-in-workspace/search-in-workspace-widget';
+import { SearchInWorkspaceFactory as TheiaSearchInWorkspaceFactory } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
+import { SearchInWorkspaceFactory } from './theia/search-in-workspace/search-in-workspace-factory';
 import { SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
 import { SearchInWorkspaceResultTreeWidget } from './theia/search-in-workspace/search-in-workspace-result-tree-widget';
 import { MonacoEditorProvider } from './theia/monaco/monaco-editor-provider';
@@ -259,7 +261,7 @@ import {
   UserFieldsDialogProps,
   UserFieldsDialogWidget,
 } from './dialogs/user-fields/user-fields-dialog';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -492,6 +494,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   bind(SearchInWorkspaceWidget).toSelf();
   rebind(TheiaSearchInWorkspaceWidget).toService(SearchInWorkspaceWidget);
+
+  // replace search icon
+  rebind(TheiaSearchInWorkspaceFactory)
+    .to(SearchInWorkspaceFactory)
+    .inSingletonScope();
+
   rebind(TheiaSearchInWorkspaceResultTreeWidget).toDynamicValue(
     ({ container }) => {
       const childContainer = createTreeContainer(container);
@@ -678,7 +686,10 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(SettingsWidget).toSelf().inSingletonScope();
   bind(SettingsDialog).toSelf().inSingletonScope();
   bind(SettingsDialogProps).toConstantValue({
-    title: 'Preferences',
+    title: nls.localize(
+      'vscode/preferences.contribution/preferences',
+      'Preferences'
+    ),
   });
 
   bind(StorageWrapper).toSelf().inSingletonScope();

arduino-ide-extension/src/browser/arduino-preferences.ts

@@ -6,7 +6,7 @@ import {
   PreferenceContribution,
   PreferenceSchema,
 } from '@theia/core/lib/browser/preferences';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 import { CompilerWarningLiterals, CompilerWarnings } from '../common/protocol';
 
 export const ArduinoConfigSchema: PreferenceSchema = {

arduino-ide-extension/src/browser/boards/boards-auto-installer.ts

@@ -10,7 +10,7 @@ import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsConfig } from './boards-config';
 import { Installable, ResponseServiceArduino } from '../../common/protocol';
 import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 
 /**
  * Listens on `BoardsConfig.Config` changes, if a board is selected which does not

arduino-ide-extension/src/browser/boards/boards-config-dialog.ts

@@ -6,7 +6,7 @@ import { BoardsConfig } from './boards-config';
 import { BoardsService } from '../../common/protocol/boards-service';
 import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsConfigDialogWidget } from './boards-config-dialog-widget';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class BoardsConfigDialogProps extends DialogProps {}

arduino-ide-extension/src/browser/boards/boards-config.tsx

@@ -14,8 +14,8 @@ import {
   AvailableBoard,
   BoardsServiceProvider,
 } from './boards-service-provider';
-import { nls } from '@theia/core/lib/browser/nls';
 import { naturalCompare } from '../../common/utils';
+import { nls } from '@theia/core/lib/common';
 
 export namespace BoardsConfig {
   export interface Config {

arduino-ide-extension/src/browser/boards/boards-data-menu-updater.ts

@@ -12,7 +12,7 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { BoardsDataStore } from './boards-data-store';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class BoardsDataMenuUpdater implements FrontendApplicationContribution {

arduino-ide-extension/src/browser/boards/boards-list-widget.ts

@@ -5,7 +5,7 @@ import {
 } from '../../common/protocol/boards-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class BoardsListWidget extends ListWidget<BoardsPackage> {