fix: diagnostics api iterable fix (#3566)

opensumi · Apr 22, 2024 · ab51474 · ab51474
1 parent f1bef23
commit ab51474
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/extension/src/hosted/api/vscode/language/diagnostics.ts b/packages/extension/src/hosted/api/vscode/language/diagnostics.ts
@@ -147,6 +147,14 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
     });
   }
 
+  *[Symbol.iterator](): IterableIterator<[uri: vscode.Uri, diagnostics: readonly vscode.Diagnostic[]]> {
+    this.ensureNotDisposed();
+    for (const uri of this.diagnostics.keys()) {
+      const uri2 = URI.parse(uri);
+      yield [uri2, this.get(uri2) || []];
+    }
+  }
+
   get(uri: URI): vscode.Diagnostic[] | undefined {
     this.ensureNotDisposed();
     return this.getDiagnosticsByUri(uri);
@@ -185,7 +193,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 
   private getDiagnosticsByUri(uri: URI): vscode.Diagnostic[] | undefined {
     const diagnostics = this.diagnostics.get(uri.toString());
-    return diagnostics instanceof Array ? (Object.freeze(diagnostics) as vscode.Diagnostic[]) : undefined;
+    return diagnostics instanceof Array ? (Object.freeze(diagnostics) as vscode.Diagnostic[]) : [];
   }
 
   private fireDiagnosticChangeEvent(arg: string | string[] | URI | URI[]): void {

diff --git a/packages/types/vscode/typings/vscode.language.d.ts b/packages/types/vscode/typings/vscode.language.d.ts
@@ -2714,7 +2714,7 @@ declare module 'vscode' {
    * To get an instance of a `DiagnosticCollection` use
    * [createDiagnosticCollection](#languages.createDiagnosticCollection).
    */
-  export interface DiagnosticCollection {
+  export interface DiagnosticCollection extends Iterable<[uri: Uri, diagnostics: readonly Diagnostic[]]>{
 
     /**
      * The name of this diagnostic collection, for instance `typescript`. Every diagnostic