@theia/plugin-ext 1.31.0-next.2 → 1.31.0-next.29

package/src/plugin/languages.ts

@@ -25,6 +25,8 @@ import {
     WorkspaceEditDto,
     PluginInfo,
     Plugin,
+    InlayHintsDto,
+    InlayHintDto,
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import * as theia from '@theia/plugin';
@@ -62,13 +64,16 @@ import {
     CallHierarchyIncomingCall,
     CallHierarchyOutgoingCall,
     LinkedEditingRanges,
-    EvaluatableExpression
+    EvaluatableExpression,
+    InlineValue,
+    InlineValueContext
 } from '../common/plugin-api-rpc-model';
 import { CompletionAdapter } from './languages/completion';
 import { Diagnostics } from './languages/diagnostics';
 import { SignatureHelpAdapter } from './languages/signature';
 import { HoverAdapter } from './languages/hover';
 import { EvaluatableExpressionAdapter } from './languages/evaluatable-expression';
+import { InlineValuesAdapter } from './languages/inline-values';
 import { DocumentHighlightAdapter } from './languages/document-highlight';
 import { DocumentFormattingAdapter } from './languages/document-formatting';
 import { RangeFormattingAdapter } from './languages/range-formatting';
@@ -98,11 +103,13 @@ import { DisposableCollection, disposableTimeout, Disposable as TheiaDisposable
 import { Severity } from '@theia/core/lib/common/severity';
 import { LinkedEditingRangeAdapter } from './languages/linked-editing-range';
 import { serializeEnterRules, serializeIndentation, serializeRegExp } from './languages-utils';
+import { InlayHintsAdapter } from './languages/inlay-hints';
 
 type Adapter = CompletionAdapter |
     SignatureHelpAdapter |
     HoverAdapter |
     EvaluatableExpressionAdapter |
+    InlineValuesAdapter |
     DocumentHighlightAdapter |
     DocumentFormattingAdapter |
     RangeFormattingAdapter |
@@ -120,6 +127,7 @@ type Adapter = CompletionAdapter |
     FoldingProviderAdapter |
     SelectionRangeProviderAdapter |
     ColorProviderAdapter |
+    InlayHintsAdapter |
     RenameAdapter |
     CallHierarchyAdapter |
     DocumentRangeSemanticTokensAdapter |
@@ -365,6 +373,25 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
     // ### EvaluatableExpression Provider end
 
+    // ### InlineValues Provider begin
+    registerInlineValuesProvider(selector: theia.DocumentSelector, provider: theia.InlineValuesProvider, pluginInfo: PluginInfo): theia.Disposable {
+        const eventHandle = typeof provider.onDidChangeInlineValues === 'function' ? this.nextCallId() : undefined;
+        const callId = this.addNewAdapter(new InlineValuesAdapter(provider, this.documents));
+        this.proxy.$registerInlineValuesProvider(callId, pluginInfo, this.transformDocumentSelector(selector));
+        let result = this.createDisposable(callId);
+
+        if (eventHandle !== undefined) {
+            const subscription = provider.onDidChangeInlineValues!(_ => this.proxy.$emitInlineValuesEvent(eventHandle));
+            result = Disposable.from(result, subscription);
+        }
+        return result;
+    }
+
+    $provideInlineValues(handle: number, resource: UriComponents, range: Range, context: InlineValueContext, token: theia.CancellationToken): Promise<InlineValue[] | undefined> {
+        return this.withAdapter(handle, InlineValuesAdapter, adapter => adapter.provideInlineValues(URI.revive(resource), range, context, token), undefined);
+    }
+    // ### InlineValue Provider end
+
     // ### Document Highlight Provider begin
     registerDocumentHighlightProvider(selector: theia.DocumentSelector, provider: theia.DocumentHighlightProvider, pluginInfo: PluginInfo): theia.Disposable {
         const callId = this.addNewAdapter(new DocumentHighlightAdapter(provider, this.documents));
@@ -579,6 +606,35 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
     // ### Color Provider end
 
+    // ### InlayHints Provider begin
+    registerInlayHintsProvider(selector: theia.DocumentSelector, provider: theia.InlayHintsProvider, pluginInfo: PluginInfo): theia.Disposable {
+        const eventHandle = typeof provider.onDidChangeInlayHints === 'function' ? this.nextCallId() : undefined;
+        const callId = this.addNewAdapter(new InlayHintsAdapter(provider, this.documents, this.commands));
+        this.proxy.$registerInlayHintsProvider(callId, pluginInfo, this.transformDocumentSelector(selector));
+
+        let result = this.createDisposable(callId);
+
+        if (eventHandle !== undefined) {
+            const subscription = provider.onDidChangeInlayHints!(() => this.proxy.$emitInlayHintsEvent(eventHandle));
+            result = Disposable.from(result, subscription);
+        }
+
+        return result;
+    }
+
+    $provideInlayHints(handle: number, resource: UriComponents, range: Range, token: theia.CancellationToken): Promise<InlayHintsDto | undefined> {
+        return this.withAdapter(handle, InlayHintsAdapter, adapter => adapter.provideInlayHints(URI.revive(resource), range, token), undefined);
+    }
+
+    $resolveInlayHint(handle: number, id: ChainedCacheId, token: theia.CancellationToken): Promise<InlayHintDto | undefined> {
+        return this.withAdapter(handle, InlayHintsAdapter, adapter => adapter.resolveInlayHint(id, token), undefined);
+    }
+
+    $releaseInlayHints(handle: number, id: number): void {
+        this.withAdapter(handle, InlayHintsAdapter, async adapter => adapter.releaseHints(id), undefined);
+    }
+    // ### InlayHints Provider end
+
     // ### Folding Range Provider begin
     registerFoldingRangeProvider(selector: theia.DocumentSelector, provider: theia.FoldingRangeProvider, pluginInfo: PluginInfo): theia.Disposable {
         const callId = this.addNewAdapter(new FoldingProviderAdapter(provider, this.documents));

package/src/plugin/plugin-context.ts

@@ -79,6 +79,10 @@ import {
     SignatureHelpTriggerKind,
     Hover,
     EvaluatableExpression,
+    InlineValueEvaluatableExpression,
+    InlineValueText,
+    InlineValueVariableLookup,
+    InlineValueContext,
     DocumentHighlightKind,
     DocumentHighlight,
     DocumentLink,
@@ -145,7 +149,11 @@ import {
     LinkedEditingRanges,
     LanguageStatusSeverity,
     TextDocumentChangeReason,
-    InputBoxValidationSeverity
+    InputBoxValidationSeverity,
+    TerminalLink,
+    InlayHint,
+    InlayHintKind,
+    InlayHintLabelPart
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -289,7 +297,7 @@ export function createAPIFactory(
             }
         };
 
-        const { onDidChangeActiveTerminal, onDidCloseTerminal, onDidOpenTerminal } = terminalExt;
+        const { onDidChangeActiveTerminal, onDidChangeTerminalState, onDidCloseTerminal, onDidOpenTerminal } = terminalExt;
         const showInformationMessage = messageRegistryExt.showMessage.bind(messageRegistryExt, MainMessageType.Info);
         const showWarningMessage = messageRegistryExt.showMessage.bind(messageRegistryExt, MainMessageType.Warning);
         const showErrorMessage = messageRegistryExt.showMessage.bind(messageRegistryExt, MainMessageType.Error);
@@ -439,6 +447,7 @@ export function createAPIFactory(
                 shellArgs?: string[]): theia.Terminal {
                 return terminalExt.createTerminal(nameOrOptions, shellPath, shellArgs);
             },
+            onDidChangeTerminalState,
             onDidCloseTerminal,
             onDidOpenTerminal,
             createTextEditorDecorationType(options: theia.DecorationRenderOptions): theia.TextEditorDecorationType {
@@ -466,8 +475,8 @@ export function createAPIFactory(
             createInputBox(): theia.InputBox {
                 return quickOpenExt.createInputBox(plugin);
             },
-            registerTerminalLinkProvider(provider: theia.TerminalLinkProvider): void {
-                /* NOOP. To be implemented at later stage */
+            registerTerminalLinkProvider(provider: theia.TerminalLinkProvider): theia.Disposable {
+                return terminalExt.registerTerminalLinkProvider(provider);
             },
             get activeColorTheme(): theia.ColorTheme {
                 return themingExt.activeColorTheme;
@@ -700,6 +709,9 @@ export function createAPIFactory(
             registerEvaluatableExpressionProvider(selector: theia.DocumentSelector, provider: theia.EvaluatableExpressionProvider): theia.Disposable {
                 return languagesExt.registerEvaluatableExpressionProvider(selector, provider, pluginToPluginInfo(plugin));
             },
+            registerInlineValuesProvider(selector: theia.DocumentSelector, provider: theia.InlineValuesProvider): theia.Disposable {
+                return languagesExt.registerInlineValuesProvider(selector, provider, pluginToPluginInfo(plugin));
+            },
             registerDocumentHighlightProvider(selector: theia.DocumentSelector, provider: theia.DocumentHighlightProvider): theia.Disposable {
                 return languagesExt.registerDocumentHighlightProvider(selector, provider, pluginToPluginInfo(plugin));
             },
@@ -739,6 +751,9 @@ export function createAPIFactory(
             registerColorProvider(selector: theia.DocumentSelector, provider: theia.DocumentColorProvider): theia.Disposable {
                 return languagesExt.registerColorProvider(selector, provider, pluginToPluginInfo(plugin));
             },
+            registerInlayHintsProvider(selector: theia.DocumentSelector, provider: theia.InlayHintsProvider): theia.Disposable {
+                return languagesExt.registerInlayHintsProvider(selector, provider, pluginToPluginInfo(plugin));
+            },
             registerFoldingRangeProvider(selector: theia.DocumentSelector, provider: theia.FoldingRangeProvider): theia.Disposable {
                 return languagesExt.registerFoldingRangeProvider(selector, provider, pluginToPluginInfo(plugin));
             },
@@ -961,6 +976,10 @@ export function createAPIFactory(
             SignatureHelpTriggerKind,
             Hover,
             EvaluatableExpression,
+            InlineValueEvaluatableExpression,
+            InlineValueText,
+            InlineValueVariableLookup,
+            InlineValueContext,
             DocumentHighlightKind,
             DocumentHighlight,
             DocumentLink,
@@ -1024,10 +1043,14 @@ export function createAPIFactory(
             ColorThemeKind,
             SourceControlInputBoxValidationType,
             FileDecoration,
+            TerminalLink,
             CancellationError,
             ExtensionMode,
             LinkedEditingRanges,
-            InputBoxValidationSeverity
+            InputBoxValidationSeverity,
+            InlayHint,
+            InlayHintKind,
+            InlayHintLabelPart
         };
     };
 }

package/src/plugin/terminal-ext.ts

@@ -14,14 +14,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 import { UUID } from '@theia/core/shared/@phosphor/coreutils';
-import { Terminal, TerminalOptions, PseudoTerminalOptions, ExtensionTerminalOptions } from '@theia/plugin';
+import { Terminal, TerminalOptions, PseudoTerminalOptions, ExtensionTerminalOptions, TerminalState } from '@theia/plugin';
 import { TerminalServiceExt, TerminalServiceMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import * as theia from '@theia/plugin';
-import { EnvironmentVariableMutatorType } from './types-impl';
+import { Disposable, EnvironmentVariableMutatorType } from './types-impl';
 import { SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/common/base-terminal-protocol';
+import { ProvidedTerminalLink } from '../common/plugin-api-rpc-model';
 
 /**
  * Provides high level terminal plugin api to use in the Theia plugins.
@@ -35,6 +36,9 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
 
     private readonly _pseudoTerminals = new Map<string, PseudoTerminal>();
 
+    private static nextTerminalLinkProviderId = 0;
+    private readonly terminalLinkProviders = new Map<string, theia.TerminalLinkProvider>();
+
     private readonly onDidCloseTerminalEmitter = new Emitter<Terminal>();
     readonly onDidCloseTerminal: theia.Event<Terminal> = this.onDidCloseTerminalEmitter.event;
 
@@ -44,6 +48,9 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     private readonly onDidChangeActiveTerminalEmitter = new Emitter<Terminal | undefined>();
     readonly onDidChangeActiveTerminal: theia.Event<Terminal | undefined> = this.onDidChangeActiveTerminalEmitter.event;
 
+    private readonly onDidChangeTerminalStateEmitter = new Emitter<Terminal>();
+    readonly onDidChangeTerminalState: theia.Event<Terminal> = this.onDidChangeTerminalStateEmitter.event;
+
     protected environmentVariableCollections: Map<string, EnvironmentVariableCollection> = new Map();
 
     constructor(rpc: RPCProtocol) {
@@ -107,6 +114,17 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         terminal.emitOnInput(data);
     }
 
+    $terminalStateChanged(id: string): void {
+        const terminal = this._terminals.get(id);
+        if (!terminal) {
+            return;
+        }
+        if (!terminal.state.isInteractedWith) {
+            terminal.state = { isInteractedWith: true };
+            this.onDidChangeTerminalStateEmitter.fire(terminal);
+        }
+    }
+
     $terminalSizeChanged(id: string, clos: number, rows: number): void {
         const terminal = this._pseudoTerminals.get(id);
         if (!terminal) {
@@ -167,6 +185,38 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         this.onDidChangeActiveTerminalEmitter.fire(this.activeTerminal);
     }
 
+    registerTerminalLinkProvider(provider: theia.TerminalLinkProvider): theia.Disposable {
+        const providerId = (TerminalServiceExtImpl.nextTerminalLinkProviderId++).toString();
+        this.terminalLinkProviders.set(providerId, provider);
+        this.proxy.$registerTerminalLinkProvider(providerId);
+        return Disposable.create(() => {
+            this.proxy.$unregisterTerminalLinkProvider(providerId);
+            this.terminalLinkProviders.delete(providerId);
+        });
+    }
+
+    async $provideTerminalLinks(line: string, terminalId: string, token: theia.CancellationToken): Promise<ProvidedTerminalLink[]> {
+        const links: ProvidedTerminalLink[] = [];
+        const terminal = this._terminals.get(terminalId);
+        if (terminal) {
+            for (const [providerId, provider] of this.terminalLinkProviders) {
+                const providedLinks = await provider.provideTerminalLinks({ line, terminal }, token);
+                if (providedLinks) {
+                    links.push(...providedLinks.map(link => ({ ...link, providerId })));
+                }
+            }
+        }
+        return links;
+    }
+
+    async $handleTerminalLink(link: ProvidedTerminalLink): Promise<void> {
+        const provider = this.terminalLinkProviders.get(link.providerId);
+        if (!provider) {
+            throw Error('Terminal link provider not found');
+        }
+        await provider.handleTerminalLink(link);
+    }
+
     /*---------------------------------------------------------------------------------------------
      *  Copyright (c) Microsoft Corporation. All rights reserved.
      *  Licensed under the MIT License. See License.txt in the project root for license information.
@@ -287,6 +337,8 @@ export class TerminalExtImpl implements Terminal {
 
     readonly creationOptions: Readonly<TerminalOptions | ExtensionTerminalOptions>;
 
+    state: TerminalState = { isInteractedWith: false };
+
     constructor(private readonly proxy: TerminalServiceMain, private readonly options: theia.TerminalOptions | theia.ExtensionTerminalOptions) {
         this.creationOptions = this.options;
     }

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

@@ -18,7 +18,7 @@
 
 import {
     TreeDataProvider, TreeView, TreeViewExpansionEvent, TreeItem, TreeItemLabel,
-    TreeViewSelectionChangeEvent, TreeViewVisibilityChangeEvent
+    TreeViewSelectionChangeEvent, TreeViewVisibilityChangeEvent, CancellationToken
 } from '@theia/plugin';
 // TODO: extract `@theia/util` for event, disposable, cancellation and common types
 // don't use @theia/core directly from plugin host
@@ -122,6 +122,14 @@ export class TreeViewsExtImpl implements TreeViewsExt {
         return treeView.getChildren(treeItemId);
     }
 
+    async $resolveTreeItem(treeViewId: string, treeItemId: string, token: CancellationToken): Promise<TreeViewItem | undefined> {
+        return this.getTreeView(treeViewId).resolveTreeItem(treeItemId, token);
+    }
+
+    async $hasResolveTreeItem(treeViewId: string): Promise<boolean> {
+        return this.getTreeView(treeViewId).hasResolveTreeItem();
+    }
+
     async $setExpanded(treeViewId: string, treeItemId: string, expanded: boolean): Promise<any> {
         const treeView = this.getTreeView(treeViewId);
 
@@ -152,6 +160,12 @@ export class TreeViewsExtImpl implements TreeViewsExt {
 
 interface TreeExtNode<T> extends Disposable {
     id: string
+    /** Collection of disposables. Must be disposed by an instance's `dispose` implementation. */
+    disposables: DisposableCollection;
+    /** The original `TreeItem` provided by the plugin's tree data provider. */
+    pluginTreeItem?: TreeItem;
+    /** The `TreeViewItem` used on the main side to render the tree node. */
+    treeViewItem?: TreeViewItem;
     value?: T
     children?: TreeExtNode<T>[]
 }
@@ -333,7 +347,8 @@ class TreeViewExtImpl<T> implements Disposable {
 
         // place root in the cache
         if (parentId === '') {
-            this.nodes.set(parentId, { id: '', dispose: () => { } });
+            const rootNodeDisposables = new DisposableCollection();
+            this.nodes.set(parentId, { id: '', disposables: rootNodeDisposables, dispose: () => { rootNodeDisposables.dispose(); } });
         }
         // ask data provider for children for cached element
         const result = await this.treeDataProvider.getChildren(parent);
@@ -356,7 +371,9 @@ class TreeViewExtImpl<T> implements Disposable {
                 const toDisposeElement = new DisposableCollection();
                 const node: TreeExtNode<T> = {
                     id,
+                    pluginTreeItem: treeItem,
                     value,
+                    disposables: toDisposeElement,
                     dispose: () => toDisposeElement.dispose()
                 };
                 if (parentNode) {
@@ -393,6 +410,7 @@ class TreeViewExtImpl<T> implements Disposable {
                     command: this.commandsConverter.toSafeCommand(treeItem.command, toDisposeElement),
                     accessibilityInformation: treeItem.accessibilityInformation
                 } as TreeViewItem;
+                node.treeViewItem = treeViewItem;
 
                 return treeViewItem;
             });
@@ -455,6 +473,26 @@ class TreeViewExtImpl<T> implements Disposable {
         }
     }
 
+    async resolveTreeItem(treeItemId: string, token: CancellationToken): Promise<TreeViewItem | undefined> {
+        if (!this.treeDataProvider.resolveTreeItem) {
+            return undefined;
+        }
+
+        const node = this.nodes.get(treeItemId);
+        if (node && node.treeViewItem && node.pluginTreeItem && node.value) {
+            const resolved = await this.treeDataProvider.resolveTreeItem(node.pluginTreeItem, node.value, token) ?? node.pluginTreeItem;
+            node.treeViewItem.command = this.commandsConverter.toSafeCommand(resolved.command, node.disposables);
+            node.treeViewItem.tooltip = resolved.tooltip;
+            return node.treeViewItem;
+        }
+
+        return undefined;
+    }
+
+    hasResolveTreeItem(): boolean {
+        return !!this.treeDataProvider.resolveTreeItem;
+    }
+
     private selectedItemIds = new Set<string>();
     get selectedElements(): T[] {
         const items: T[] = [];

package/src/plugin/type-converters.ts

@@ -16,7 +16,7 @@
 
 import * as theia from '@theia/plugin';
 import * as lstypes from '@theia/core/shared/vscode-languageserver-protocol';
-import { QuickPickItemKind, URI } from './types-impl';
+import { InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, QuickPickItemKind, URI } from './types-impl';
 import * as rpc from '../common/plugin-api-rpc';
 import {
     DecorationOptions, EditorPosition, Plugin, Position, WorkspaceTextEditDto, WorkspaceFileEditDto, Selection, TaskDto, WorkspaceEditDto
@@ -129,7 +129,7 @@ export function fromRange(range: theia.Range | undefined): model.Range | undefin
     };
 }
 
-export function fromPosition(position: types.Position): Position {
+export function fromPosition(position: types.Position | theia.Position): Position {
     return { lineNumber: position.line + 1, column: position.character + 1 };
 }
 
@@ -233,7 +233,7 @@ export function fromGlobPattern(pattern: theia.GlobPattern): string | RelativePa
     }
 
     if (isRelativePattern(pattern)) {
-        return new types.RelativePattern(pattern.base, pattern.pattern);
+        return new types.RelativePattern(pattern.baseUri, pattern.pattern);
     }
 
     return pattern;
@@ -241,7 +241,7 @@ export function fromGlobPattern(pattern: theia.GlobPattern): string | RelativePa
 
 function isRelativePattern(obj: {}): obj is theia.RelativePattern {
     const rp = obj as theia.RelativePattern;
-    return rp && typeof rp.base === 'string' && typeof rp.pattern === 'string';
+    return rp && typeof rp.baseUri === 'string' && typeof rp.pattern === 'string';
 }
 
 export function fromCompletionItemKind(kind?: types.CompletionItemKind): model.CompletionItemKind {
@@ -401,6 +401,39 @@ export function fromEvaluatableExpression(evaluatableExpression: theia.Evaluatab
     };
 }
 
+export function fromInlineValue(inlineValue: theia.InlineValue): model.InlineValue {
+    if (inlineValue instanceof InlineValueText) {
+        return <model.InlineValueText>{
+            type: 'text',
+            range: fromRange(inlineValue.range),
+            text: inlineValue.text
+        };
+    } else if (inlineValue instanceof InlineValueVariableLookup) {
+        return <model.InlineValueVariableLookup>{
+            type: 'variable',
+            range: fromRange(inlineValue.range),
+            variableName: inlineValue.variableName,
+            caseSensitiveLookup: inlineValue.caseSensitiveLookup
+        };
+    } else if (inlineValue instanceof InlineValueEvaluatableExpression) {
+        return <model.InlineValueEvaluatableExpression>{
+            type: 'expression',
+            range: fromRange(inlineValue.range),
+            expression: inlineValue.expression
+        };
+    } else {
+        throw new Error('Unknown InlineValue type');
+    }
+}
+
+export function toInlineValueContext(inlineValueContext: model.InlineValueContext): theia.InlineValueContext {
+    const ivLocation = inlineValueContext.stoppedLocation;
+    return <theia.InlineValueContext>{
+        frameId: inlineValueContext.frameId,
+        stoppedLocation: new types.Range(ivLocation.startLineNumber, ivLocation.startColumn, ivLocation.endLineNumber, ivLocation.endColumn)
+    };
+}
+
 export function fromLocation(location: theia.Location): model.Location {
     return <model.Location>{
         uri: location.uri,
@@ -584,7 +617,7 @@ export namespace SymbolKind {
     }
 }
 
-export function toCodeActionTriggerKind(triggerKind: model.CodeActionTriggerKind): types.CodeActionTriggerKind  {
+export function toCodeActionTriggerKind(triggerKind: model.CodeActionTriggerKind): types.CodeActionTriggerKind {
     switch (triggerKind) {
         case model.CodeActionTriggerKind.Invoke:
             return types.CodeActionTriggerKind.Invoke;
@@ -1237,3 +1270,12 @@ export function pluginToPluginInfo(plugin: Plugin): rpc.PluginInfo {
         displayName: plugin.model.displayName
     };
 }
+
+export namespace InlayHintKind {
+    export function from(kind: theia.InlayHintKind): model.InlayHintKind {
+        return kind;
+    }
+    export function to(kind: model.InlayHintKind): theia.InlayHintKind {
+        return kind;
+    }
+}

package/src/plugin/types-impl.spec.ts

@@ -66,4 +66,20 @@ describe('API Type Implementations:', () => {
                 'myScheme://authority/path/file.js?query#fragment');
         });
     });
+
+    describe('RelativePattern:', () => {
+        it('should update .base when setting .baseUri', () => {
+            const testUri = types.URI.file('/expected/file/path');
+            const rPattern = new types.RelativePattern('/initial/unrelated/path', 'not relevant');
+            rPattern.baseUri = testUri;
+            assert.strictEqual(rPattern.base, testUri.fsPath);
+        });
+
+        it('should update .baseUri when setting .base', () => {
+            const testUri = types.URI.file('/expected/file/path');
+            const rPattern = new types.RelativePattern('/initial/unrelated/path', 'not relevant');
+            rPattern.base = testUri.fsPath;
+            assert.strictEqual(rPattern.baseUri.toString(), testUri.toString());
+        });
+    });
 });