Ignore duplicate types (#14327)

* Ignore duplicate types * oops
microsoft · Sep 14, 2023 · c2a2d6a · c2a2d6a
1 parent 55fe039
commit c2a2d6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/api/proposed.js b/api/proposed.js
@@ -34,7 +34,10 @@ fs.readdirSync(path.join(__dirname, '../src')).forEach((file) => {
                     return true;
                 }
                 if (line.startsWith('import ') && line.trim().endsWith(';')) {
-                    proposedApiImports.push(line);
+                    if (!proposedApiImports.includes(line)) {
+                        proposedApiImports.push('// @ts-ignore Ignore Duplicate types');
+                        proposedApiImports.push(line);
+                    }
                     return false;
                 }
                 if (line.startsWith(newModuleDeclaration)) {
@@ -57,7 +60,7 @@ const newSource = source
     .split(/\r?\n/g)
     .map((line) => {
         if (proposedApiImports.length && line.startsWith('import ') && line.trim().endsWith(';')) {
-            const newLine = [line, ...proposedApiImports].join(EOL);
+            const newLine = ['// @ts-ignore Ignore Duplicate types', line, ...proposedApiImports].join(EOL);
             proposedApiImports = [];
             return newLine;
         }

diff --git a/src/api.d.ts b/src/api.d.ts
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import type { CancellationToken, ProviderResult, CancellationError } from 'vscode';
-import type { Event, Uri } from 'vscode';
+import type { CancellationToken, ProviderResult, CancellationError, Event, Uri } from 'vscode';
 
 export interface Jupyter {
     /**