@theia/plugin-ext 1.24.0-next.3 → 1.24.0-next.6

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.24.0-next.3+edff911beab",
+  "version": "1.24.0-next.6+7fd85c0991f",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.24.0-next.3+edff911beab",
-    "@theia/callhierarchy": "1.24.0-next.3+edff911beab",
-    "@theia/console": "1.24.0-next.3+edff911beab",
-    "@theia/core": "1.24.0-next.3+edff911beab",
-    "@theia/debug": "1.24.0-next.3+edff911beab",
-    "@theia/editor": "1.24.0-next.3+edff911beab",
-    "@theia/file-search": "1.24.0-next.3+edff911beab",
-    "@theia/filesystem": "1.24.0-next.3+edff911beab",
-    "@theia/markers": "1.24.0-next.3+edff911beab",
-    "@theia/messages": "1.24.0-next.3+edff911beab",
-    "@theia/monaco": "1.24.0-next.3+edff911beab",
-    "@theia/navigator": "1.24.0-next.3+edff911beab",
-    "@theia/output": "1.24.0-next.3+edff911beab",
-    "@theia/plugin": "1.24.0-next.3+edff911beab",
-    "@theia/preferences": "1.24.0-next.3+edff911beab",
-    "@theia/scm": "1.24.0-next.3+edff911beab",
-    "@theia/search-in-workspace": "1.24.0-next.3+edff911beab",
-    "@theia/task": "1.24.0-next.3+edff911beab",
-    "@theia/terminal": "1.24.0-next.3+edff911beab",
-    "@theia/timeline": "1.24.0-next.3+edff911beab",
-    "@theia/workspace": "1.24.0-next.3+edff911beab",
+    "@theia/bulk-edit": "1.24.0-next.6+7fd85c0991f",
+    "@theia/callhierarchy": "1.24.0-next.6+7fd85c0991f",
+    "@theia/console": "1.24.0-next.6+7fd85c0991f",
+    "@theia/core": "1.24.0-next.6+7fd85c0991f",
+    "@theia/debug": "1.24.0-next.6+7fd85c0991f",
+    "@theia/editor": "1.24.0-next.6+7fd85c0991f",
+    "@theia/file-search": "1.24.0-next.6+7fd85c0991f",
+    "@theia/filesystem": "1.24.0-next.6+7fd85c0991f",
+    "@theia/markers": "1.24.0-next.6+7fd85c0991f",
+    "@theia/messages": "1.24.0-next.6+7fd85c0991f",
+    "@theia/monaco": "1.24.0-next.6+7fd85c0991f",
+    "@theia/navigator": "1.24.0-next.6+7fd85c0991f",
+    "@theia/output": "1.24.0-next.6+7fd85c0991f",
+    "@theia/plugin": "1.24.0-next.6+7fd85c0991f",
+    "@theia/preferences": "1.24.0-next.6+7fd85c0991f",
+    "@theia/scm": "1.24.0-next.6+7fd85c0991f",
+    "@theia/search-in-workspace": "1.24.0-next.6+7fd85c0991f",
+    "@theia/task": "1.24.0-next.6+7fd85c0991f",
+    "@theia/terminal": "1.24.0-next.6+7fd85c0991f",
+    "@theia/timeline": "1.24.0-next.6+7fd85c0991f",
+    "@theia/workspace": "1.24.0-next.6+7fd85c0991f",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
     "escape-html": "^1.0.3",
@@ -90,5 +90,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "edff911beab46fdbd83fc45ad021d07e07a598fe"
+  "gitHead": "7fd85c0991f4adc4bb79dd749aa8495df2aff1a3"
 }

package/src/common/plugin-api-rpc.ts

@@ -1402,6 +1402,7 @@ export interface ProcessTaskDto extends TaskDto, CommandProperties {
 export interface PluginInfo {
     id: string;
     name: string;
+    displayName?: string;
 }
 
 export interface LanguagesExt {
@@ -1503,7 +1504,7 @@ export interface LanguagesMain {
     $registerDocumentLinkProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
     $registerCodeLensSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], eventHandle?: number): void;
     $emitCodeLensEvent(eventHandle: number, event?: any): void;
-    $registerOutlineSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
+    $registerOutlineSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], displayName?: string): void;
     $registerWorkspaceSymbolProvider(handle: number, pluginInfo: PluginInfo): void;
     $registerFoldingRangeProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;
     $registerSelectionRangeProvider(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void;

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

@@ -459,14 +459,15 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
         }
     }
 
-    $registerOutlineSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[]): void {
+    $registerOutlineSupport(handle: number, pluginInfo: PluginInfo, selector: SerializedDocumentFilter[], displayName?: string): void {
         const languageSelector = this.toLanguageSelector(selector);
-        const symbolProvider = this.createDocumentSymbolProvider(handle);
+        const symbolProvider = this.createDocumentSymbolProvider(handle, displayName);
         this.register(handle, monaco.modes.DocumentSymbolProviderRegistry.register(languageSelector, symbolProvider));
     }
 
-    protected createDocumentSymbolProvider(handle: number): monaco.languages.DocumentSymbolProvider {
+    protected createDocumentSymbolProvider(handle: number, displayName?: string): monaco.languages.DocumentSymbolProvider {
         return {
+            displayName,
             provideDocumentSymbols: (model, token) => this.provideDocumentSymbols(handle, model, token)
         };
     }

package/src/plugin/languages.ts

@@ -531,9 +531,11 @@ export class LanguagesExtImpl implements LanguagesExt {
     // ### Code Reference Provider end
 
     // ### Document Symbol Provider begin
-    registerDocumentSymbolProvider(selector: theia.DocumentSelector, provider: theia.DocumentSymbolProvider, pluginInfo: PluginInfo): theia.Disposable {
+    registerDocumentSymbolProvider(selector: theia.DocumentSelector, provider: theia.DocumentSymbolProvider, pluginInfo: PluginInfo,
+        metadata?: theia.DocumentSymbolProviderMetadata): theia.Disposable {
         const callId = this.addNewAdapter(new OutlineAdapter(this.documents, provider));
-        this.proxy.$registerOutlineSupport(callId, pluginInfo, this.transformDocumentSelector(selector));
+        const displayName = (metadata && metadata.label) || getPluginLabel(pluginInfo);
+        this.proxy.$registerOutlineSupport(callId, pluginInfo, this.transformDocumentSelector(selector), displayName);
         return this.createDisposable(callId);
     }
 
@@ -700,3 +702,7 @@ function serializeIndentation(indentationRules?: theia.IndentationRule): Seriali
         unIndentedLinePattern: serializeRegExp(indentationRules.unIndentedLinePattern)
     };
 }
+
+function getPluginLabel(pluginInfo: PluginInfo): string {
+    return pluginInfo.displayName || pluginInfo.name;
+}

package/src/plugin/plugin-context.ts

@@ -752,8 +752,9 @@ export function createAPIFactory(
             registerReferenceProvider(selector: theia.DocumentSelector, provider: theia.ReferenceProvider): theia.Disposable {
                 return languagesExt.registerReferenceProvider(selector, provider, pluginToPluginInfo(plugin));
             },
-            registerDocumentSymbolProvider(selector: theia.DocumentSelector, provider: theia.DocumentSymbolProvider): theia.Disposable {
-                return languagesExt.registerDocumentSymbolProvider(selector, provider, pluginToPluginInfo(plugin));
+            registerDocumentSymbolProvider(selector: theia.DocumentSelector, provider: theia.DocumentSymbolProvider,
+                metadata?: theia.DocumentSymbolProviderMetadata): theia.Disposable {
+                return languagesExt.registerDocumentSymbolProvider(selector, provider, pluginToPluginInfo(plugin), metadata);
             },
             registerColorProvider(selector: theia.DocumentSelector, provider: theia.DocumentColorProvider): theia.Disposable {
                 return languagesExt.registerColorProvider(selector, provider, pluginToPluginInfo(plugin));

package/src/plugin/type-converters.ts

@@ -1217,6 +1217,7 @@ export function pathOrURIToURI(value: string | URI): URI {
 export function pluginToPluginInfo(plugin: Plugin): rpc.PluginInfo {
     return {
         id: plugin.model.id,
-        name: plugin.model.name
+        name: plugin.model.name,
+        displayName: plugin.model.displayName
     };
 }