Addressed review comments

eclipse-theia · Apr 7, 2022 · 5ba001c · 5ba001c
1 parent 917d913
commit 5ba001c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 29 deletions.
diff --git a/packages/plugin-ext/src/plugin/comments.ts b/packages/plugin-ext/src/plugin/comments.ts
@@ -171,7 +171,8 @@ export class CommentsExtImpl implements CommentsExt {
 
         const documentData = this._documents.getDocumentData(URI.revive(uriComponents));
         if (documentData) {
-            const ranges: theia.Range[] | undefined = await commentController.commentingRangeProvider!.provideCommentingRanges(documentData.document, token);
+            const ranges: theia.Range[] | undefined | null =
+                await commentController.commentingRangeProvider!.provideCommentingRanges(documentData.document, token);
             if (ranges) {
                 return ranges.map(x => fromRange(x));
             }

diff --git a/packages/plugin-ext/src/plugin/languages/lens.ts b/packages/plugin-ext/src/plugin/languages/lens.ts
@@ -71,7 +71,7 @@ export class CodeLensAdapter {
             return undefined;
         }
 
-        let newLens: theia.CodeLens | undefined;
+        let newLens: theia.CodeLens | undefined | null;
         if (typeof this.provider.resolveCodeLens === 'function' && !lens.isResolved) {
             newLens = await this.provider.resolveCodeLens(lens, token);
             if (token.isCancellationRequested) {

diff --git a/packages/plugin-ext/src/plugin/node/debug/debug.ts b/packages/plugin-ext/src/plugin/node/debug/debug.ts
@@ -406,9 +406,6 @@ export class DebugExtImpl implements DebugExt {
         return result;
     }
 
-    /**
-     * @deprecated since 1.25.0. Use $registerDebugConfigurationProvider with $resolveDebugConfigurationByHandle instead.
-     */
     async $resolveDebugConfigurations(debugConfiguration: theia.DebugConfiguration, workspaceFolderUri: string | undefined): Promise<theia.DebugConfiguration | undefined> {
         let current = debugConfiguration;
 
@@ -434,9 +431,6 @@ export class DebugExtImpl implements DebugExt {
         return current;
     }
 
-    /**
-     * @deprecated since 1.25.0. Use $registerDebugConfigurationProvider with $resolveDebugConfigurationWithSubstitutedVariablesByHandle instead.
-     */
     async $resolveDebugConfigurationWithSubstitutedVariables(debugConfiguration: theia.DebugConfiguration, workspaceFolderUri: string | undefined):
         Promise<theia.DebugConfiguration | undefined> {
         let current = debugConfiguration;

diff --git a/packages/plugin-ext/src/plugin/tree/tree-views.ts b/packages/plugin-ext/src/plugin/tree/tree-views.ts
@@ -262,7 +262,8 @@ class TreeViewExtImpl<T> implements Disposable {
             // root
             return [];
         }
-        const parent = this.treeDataProvider.getParent && await this.treeDataProvider.getParent(element);
+        const result = this.treeDataProvider.getParent && await this.treeDataProvider.getParent(element);
+        const parent = result ? result : undefined;
         const chain = await this.calculateRevealParentChain(parent);
         if (!chain) {
             // parents are inconsistent

diff --git a/packages/plugin-ext/src/plugin/workspace.ts b/packages/plugin-ext/src/plugin/workspace.ts
@@ -279,11 +279,11 @@ export class WorkspaceExtImpl implements WorkspaceExt {
     async $provideTextDocumentContent(documentURI: string): Promise<string | undefined> {
         const uri = URI.parse(documentURI);
         const provider = this.documentContentProviders.get(uri.scheme);
-        if (provider) {
-            return provider.provideTextDocumentContent(uri, CancellationToken.None);
+        if (!provider) {
+            return undefined;
         }
-
-        return undefined;
+        const response = await provider.provideTextDocumentContent(uri, CancellationToken.None);
+        return response ? response : undefined;
     }
 
     getWorkspaceFolder(uri: theia.Uri, resolveParent?: boolean): theia.WorkspaceFolder | undefined {

diff --git a/packages/plugin/src/theia.d.ts b/packages/plugin/src/theia.d.ts
@@ -6844,8 +6844,7 @@ export module '@theia/plugin' {
      * thenable.
      *
      */
-    export type ProviderResult<T> = T | undefined | PromiseLike<T | undefined>;
-
+    export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
     /**
      * A symbol kind.
      */
@@ -9662,10 +9661,7 @@ export module '@theia/plugin' {
          * @param token A cancellation token.
          * @return An array of {@link DebugConfiguration debug configurations}.
          */
-        provideDebugConfigurations?(
-            folder: WorkspaceFolder | undefined,
-            token?: CancellationToken
-        ): ProviderResult<DebugConfiguration[]>;
+        provideDebugConfigurations?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]>;
 
         /**
          * Resolves a [debug configuration](#DebugConfiguration) by filling in missing values or by adding/changing/removing attributes.
@@ -9679,11 +9675,7 @@ export module '@theia/plugin' {
          * @param token A cancellation token.
          * @return The resolved debug configuration or undefined or null.
          */
-        resolveDebugConfiguration?(
-            folder: WorkspaceFolder | undefined,
-            debugConfiguration: DebugConfiguration,
-            token?: CancellationToken
-        ): ProviderResult<DebugConfiguration | undefined | null>;
+        resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
 
         /**
          * This hook is directly called after 'resolveDebugConfiguration' but with all variables substituted.
@@ -9698,11 +9690,7 @@ export module '@theia/plugin' {
          * @param token A cancellation token.
          * @return The resolved debug configuration or undefined or null.
          */
-        resolveDebugConfigurationWithSubstitutedVariables?(
-            folder: WorkspaceFolder | undefined,
-            debugConfiguration: DebugConfiguration,
-            token?: CancellationToken
-        ): ProviderResult<DebugConfiguration | undefined | null>;
+        resolveDebugConfigurationWithSubstitutedVariables?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
     }
 
     /**