@theia/plugin-ext 1.57.0 → 1.58.0

package/src/plugin/plugin-context.ts

@@ -236,7 +236,9 @@ import {
     PortAutoForwardAction,
     PortAttributes,
     DebugVisualization,
-    TerminalShellExecutionCommandLineConfidence
+    TerminalShellExecutionCommandLineConfidence,
+    TerminalCompletionItemKind,
+    TerminalCompletionList
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -656,6 +658,13 @@ export function createAPIFactory(
             registerProfileContentHandler(id: string, profileContentHandler: theia.ProfileContentHandler): theia.Disposable {
                 return Disposable.NULL;
             },
+            /** @stubbed TerminalCompletionProvider */
+            registerTerminalCompletionProvider<T extends theia.TerminalCompletionItem>(
+                provider: theia.TerminalCompletionProvider<T>,
+                ...triggerCharacters: string[]
+            ): theia.Disposable {
+                return Disposable.NULL;
+            },
             /** @stubbed TerminalQuickFixProvider */
             registerTerminalQuickFixProvider(id: string, provider: theia.TerminalQuickFixProvider): theia.Disposable {
                 return terminalExt.registerTerminalQuickFixProvider(id, provider);
@@ -1570,7 +1579,9 @@ export function createAPIFactory(
             PortAutoForwardAction,
             PortAttributes,
             DebugVisualization,
-            TerminalShellExecutionCommandLineConfidence
+            TerminalShellExecutionCommandLineConfidence,
+            TerminalCompletionItemKind,
+            TerminalCompletionList
         };
     };
 }

package/src/plugin/preference-registry.ts

@@ -34,6 +34,7 @@ import { RPCProtocol } from '../common/rpc-protocol';
 import { isObject, mixin } from '../common/types';
 import { WorkspaceExtImpl } from './workspace';
 import cloneDeep = require('lodash.clonedeep');
+import { ILogService, LogLevel } from '@theia/monaco-editor-core/esm/vs/platform/log/common/log';
 
 const injectionRe = /\b__proto__\b|\bconstructor\.prototype\b/;
 
@@ -79,6 +80,30 @@ export class TheiaWorkspace extends Workspace {
     }
 }
 
+const logService: ILogService = {
+    _serviceBrand: undefined,
+    onDidChangeLogLevel: new Emitter<LogLevel>().event,
+    getLevel: function (): LogLevel {
+        return LogLevel.Info;
+    },
+    setLevel: function (level: LogLevel): void {
+    },
+    trace: function (message: string, ...args: any[]): void {
+    },
+    debug: function (message: string, ...args: any[]): void {
+    },
+    info: function (message: string, ...args: any[]): void {
+    },
+    warn: function (message: string, ...args: any[]): void {
+    },
+    error: function (message: string | Error, ...args: any[]): void {
+    },
+    flush: function (): void {
+    },
+    dispose: function (): void {
+    }
+};
+
 @injectable()
 export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
     @inject(RPCProtocol)
@@ -251,19 +276,27 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         Object.keys(data[PreferenceScope.Folder]).forEach(resource => {
             folderConfigurations.set(URI.parse(resource), this.getConfigurationModel(`Folder: ${resource}`, data[PreferenceScope.Folder][resource]));
         });
+
+        function createEmptyModel(): ConfigurationModel {
+            return new ConfigurationModel({}, [], [], undefined, logService);
+        }
+
         return new Configuration(
             defaultConfiguration,
-            new ConfigurationModel(), /** policy configuration. */
-            new ConfigurationModel(), /** application configuration. */
+            createEmptyModel(), /** policy configuration. */
+            createEmptyModel(), /** application configuration. */
             userConfiguration,
-            new ConfigurationModel(), /** remote configuration. */
+            createEmptyModel(), /** remote configuration. */
             workspaceConfiguration,
-            folderConfigurations
+            folderConfigurations,
+            ConfigurationModel.createEmptyModel(logService),
+            new ResourceMap<ConfigurationModel>(),
+            logService
         );
     }
 
     private getConfigurationModel(label: string, data: { [key: string]: any }): ConfigurationModel {
-        const parser = new ConfigurationModelParser(label);
+        const parser = new ConfigurationModelParser(label, logService);
         const sanitized = this.sanitize(data);
         parser.parseRaw(sanitized);
         return parser.configurationModel;

package/src/plugin/tree/tree-views.ts

@@ -252,8 +252,22 @@ class TreeViewExtImpl<T> implements Disposable {
             dragMimeTypes, dropMimeTypes
         });
         this.toDispose.push(Disposable.create(() => this.proxy.$unregisterTreeDataProvider(treeViewId)));
-        options.treeDataProvider.onDidChangeTreeData?.(() => {
-            this.pendingRefresh = proxy.$refresh(treeViewId);
+        options.treeDataProvider.onDidChangeTreeData?.(elements => {
+            const ids = [];
+            elements = elements || [];
+            if (!Array.isArray(elements)) {
+                elements = [elements];
+            }
+            const set = new Set<T>();
+            for (const element of elements) {
+                set.add(element);
+            }
+            for (const node of this.nodes.values()) {
+                if (node.value && set.has(node.value)) {
+                    ids.push(node.id);
+                }
+            }
+            this.pendingRefresh = proxy.$refresh(treeViewId, ids);
         });
     }
 
@@ -378,7 +392,7 @@ class TreeViewExtImpl<T> implements Disposable {
         let counter = 0;
         do {
             id = `${prefix}/${counter}:${elementId}`;
-            if (!mustReturnNew || !this.nodes.has(id) || this.nodes.get(id) === item) {
+            if (!mustReturnNew || !this.nodes.has(id) || this.nodes.get(id)?.pluginTreeItem === item) {
                 // Return first if asked for or
                 // Return if handle does not exist or
                 // Return if handle is being reused

package/src/plugin/type-converters.spec.ts

@@ -177,10 +177,10 @@ describe('Type converters:', () => {
     describe('convert tasks:', () => {
         const customType = 'custom';
         const shellType = 'shell';
-        const label = 'yarn build';
+        const label = 'npm run build';
         const source = 'source';
-        const command = 'yarn';
-        const commandLine = 'yarn run build';
+        const command = 'npm';
+        const commandLine = 'npm run build';
         const args = ['run', 'build'];
         const cwd = '/projects/theia';
         const additionalProperty = 'some property';
@@ -252,7 +252,7 @@ describe('Type converters:', () => {
             ...shellPluginTask, execution: {
                 command: {
                     quoting: types.ShellQuoting.Strong,
-                    value: 'yarn'
+                    value: 'npm'
                 },
                 args,
                 options: {

package/src/plugin/types-impl.ts

@@ -1647,6 +1647,7 @@ export class DocumentLink {
 @es5ClassCompat
 export class DocumentDropOrPasteEditKind {
     static readonly Empty: DocumentDropOrPasteEditKind = new DocumentDropOrPasteEditKind('');
+    static readonly Text: DocumentDropOrPasteEditKind = new DocumentDropOrPasteEditKind('text');
 
     private static sep = '.';
 
@@ -3842,6 +3843,33 @@ export enum EditSessionIdentityMatch {
 }
 // #endregion
 
+// #region terminalCompletionProvider
+export class TerminalCompletionList<T extends theia.TerminalCompletionItem> {
+
+    resourceRequestConfig?: theia.TerminalResourceRequestConfig;
+
+    items: T[];
+
+    /**
+     * Creates a new completion list.
+     *
+     * @param items The completion items.
+     * @param resourceRequestConfig Indicates which resources should be shown as completions for the cwd of the terminal.
+     * @stubbed
+     */
+    constructor(items?: T[], resourceRequestConfig?: theia.TerminalResourceRequestConfig) {
+    }
+}
+
+export enum TerminalCompletionItemKind {
+    File = 0,
+    Folder = 1,
+    Flag = 2,
+    Method = 3,
+    Argument = 4
+}
+// #endregion
+
 // #region terminalQuickFixProvider
 export class TerminalQuickFixTerminalCommand {
     /**

package/src/plugin/workspace.ts

@@ -188,8 +188,7 @@ export class WorkspaceExtImpl implements WorkspaceExt {
         });
     }
 
-    findFiles(include: theia.GlobPattern, exclude?: theia.GlobPattern | null, maxResults?: number,
-        token: CancellationToken = CancellationToken.None): PromiseLike<URI[]> {
+    findFiles(include: theia.GlobPattern, exclude?: theia.GlobPattern | null, maxResults?: number, token: CancellationToken = CancellationToken.None): PromiseLike<URI[]> {
         let includePattern: string;
         let includeFolderUri: string | undefined;
         if (include) {
@@ -203,25 +202,29 @@ export class WorkspaceExtImpl implements WorkspaceExt {
             includePattern = '';
         }
 
-        let excludePatternOrDisregardExcludes: string | false;
-        if (exclude === undefined) {
-            excludePatternOrDisregardExcludes = ''; // default excludes
-        } else if (exclude) {
+        let excludeString: string = '';
+        let useFileExcludes = true;
+        if (exclude === null) {
+            useFileExcludes = false;
+        } else if (exclude !== undefined) {
             if (typeof exclude === 'string') {
-                excludePatternOrDisregardExcludes = exclude;
+                excludeString = exclude;
             } else {
-                excludePatternOrDisregardExcludes = exclude.pattern;
+                excludeString = exclude.pattern;
             }
-        } else {
-            excludePatternOrDisregardExcludes = false; // no excludes
         }
 
         if (token && token.isCancellationRequested) {
             return Promise.resolve([]);
         }
 
-        return this.proxy.$startFileSearch(includePattern, includeFolderUri, excludePatternOrDisregardExcludes, maxResults, token)
-            .then(data => Array.isArray(data) ? data.map(uri => URI.revive(uri)) : []);
+        return this.proxy.$startFileSearch(includePattern, includeFolderUri, {
+            maxResults,
+            exclude: excludeString,
+            useDefaultExcludes: useFileExcludes,
+            useDefaultSearchExcludes: false,
+            useIgnoreFiles: false
+        }, token).then(data => Array.isArray(data) ? data.map(uri => URI.revive(uri)) : []);
     }
 
     findTextInFiles(query: theia.TextSearchQuery, optionsOrCallback: theia.FindTextInFilesOptions | ((result: theia.TextSearchResult) => void),