@theia/plugin-ext 1.72.0-next.5 → 1.72.0-next.50

package/src/hosted/node/scanners/scanner-theia.ts

@@ -73,7 +73,8 @@ import { GrammarsReader } from './grammars-reader';
 import { CharacterPair } from '../../../common/plugin-api-rpc';
 import { isENOENT } from '../../../common/errors';
 import * as jsoncparser from 'jsonc-parser';
-import { IJSONSchema } from '@theia/core/lib/common/json-schema';
+import { IJSONSchema, JsonType } from '@theia/core/lib/common/json-schema';
+import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { PreferenceSchema, PreferenceDataProperty } from '@theia/core/lib/common/preferences/preference-schema';
 import { TaskDefinition } from '@theia/task/lib/common/task-protocol';
@@ -90,6 +91,22 @@ function getFileExtension(filePath: string): string {
     return index === -1 ? '' : filePath.substring(index + 1);
 }
 
+/**
+ * Mirrors VS Code's `ConfigurationRegistry.getDefaultValue(type)`: plugins expect typed-but-defaultless properties to read as a type-based default, not `undefined`.
+ */
+function deriveDefaultForType(type: JsonType | JsonType[] | undefined): JSONValue {
+    const t = Array.isArray(type) ? type[0] : type;
+    switch (t) {
+        case 'boolean': return false;
+        case 'integer':
+        case 'number': return 0;
+        case 'string': return '';
+        case 'array': return [];
+        case 'object': return {};
+        default: return null;
+    }
+}
+
 type PluginPackageWithContributes = PluginPackage & { contributes: PluginPackageContribution };
 
 type ScopeString = 'machine-overridable' | 'window' | 'resource' | 'language-overridable' | 'application' | 'machine';
@@ -774,7 +791,8 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
                 const schemaProperty: PreferenceDataProperty = {
                     ...property,
                     scope: scopeInfo.scope,
-                    overridable: scopeInfo.overridable
+                    overridable: scopeInfo.overridable,
+                    default: property.default !== undefined ? property.default : deriveDefaultForType(property.type)
                 };
 
                 schema.properties[key] = schemaProperty;

package/src/main/browser/style/index.css

@@ -14,6 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
+@import "./plugin-sidebar.css";
+@import "./webview.css";
+@import "./tree.css";
+
 .spinnerContainer {
   width: 100%;
   height: 100%;
@@ -78,7 +82,3 @@
   background-size: var(--theia-private-sidebar-icon-size) !important;
   font-size: var(--theia-private-sidebar-icon-size) !important;
 }
-
-@import "./plugin-sidebar.css";
-@import "./webview.css";
-@import "./tree.css";

package/src/main/browser/tabs/tabs-main.ts

@@ -101,8 +101,10 @@ export class TabsMainImpl implements TabsMain, Disposable {
 
         this.connectToSignal(this.toDisposeOnDestroy, this.applicationShell.mainPanel.widgetRemoved, (mainPanel, widget) => {
             if (!(widget instanceof TabBar)) {
-                const tabInfo = this.getOrRebuildModel(this.tabInfoLookup, widget.title)!;
-                this.onTabClosed(tabInfo, widget.title);
+                const tabInfo = this.getOrRebuildModel(this.tabInfoLookup, widget.title);
+                if (tabInfo) {
+                    this.onTabClosed(tabInfo, widget.title);
+                }
                 if (this.tabGroupChanged) {
                     this.tabGroupChanged = false;
                     this.createTabsModel();
@@ -268,12 +270,12 @@ export class TabsMainImpl implements TabsMain, Disposable {
             a.id === b.id;
     }
 
-    protected getOrRebuildModel<T, R>(map: Map<T, R>, key: T): R {
+    protected getOrRebuildModel<T, R>(map: Map<T, R>, key: T): R | undefined {
         // something broke so we rebuild the model
         let item = map.get(key);
         if (!item) {
             this.createTabsModel();
-            item = map.get(key)!;
+            item = map.get(key);
         }
         return item;
     }
@@ -281,6 +283,9 @@ export class TabsMainImpl implements TabsMain, Disposable {
     // #region event listeners
     private onTabCreated(tabBar: TabBar<Widget>, args: TabBar.ITabActivateRequestedArgs<Widget>): void {
         const group = this.getOrRebuildModel(this.tabGroupModel, tabBar);
+        if (!group) {
+            return;
+        }
         this.connectToSignal(this.getTitleDisposables(args.title), args.title.changed, this.onTabTitleChanged);
         const tabDto = this.createTabDto(args.title, group.groupId, true);
         this.tabInfoLookup.set(args.title, { group, tab: tabDto, tabIndex: args.index });

package/src/plugin/plugin-manager.ts

@@ -306,7 +306,7 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
                         }
                     }
 
-                    let pluginMain = this.host.loadPlugin(plugin);
+                    let pluginMain = await this.host.loadPlugin(plugin);
                     // see https://github.com/TypeFox/vscode/blob/70b8db24a37fafc77247de7f7cb5bb0195120ed0/src/vs/workbench/api/common/extHostExtensionService.ts#L372-L376
                     pluginMain = pluginMain || {};
                     await this.startPlugin(plugin, configStorage, pluginMain);