Merge pull request #227 from CompuIves/fix/extension-order

fix: swap toRemove & toAdd in deltaExtensions
CodinGame · Nov 7, 2023 · 7afc32a · 7afc32a
2 parents 29f389a + 0f8c669
commit 7afc32a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/service-override/extensions.ts b/src/service-override/extensions.ts
@@ -433,14 +433,14 @@ export class SimpleExtensionService extends AbstractExtensionService implements
 
   public async deltaExtensions (toAdd: IExtensionWithExtHostKind[], toRemove: IExtension[]): Promise<void> {
     const extHostPicker = (this._extensionHostKindPicker as LocalBrowserExtensionHostKindPicker)
+    for (const extension of toRemove) {
+      extHostPicker.removeForcedExtensionHostKind(extension.identifier.id)
+    }
     for (const extension of toAdd) {
       if (extension.extHostKind != null) {
         extHostPicker.setForcedExtensionHostKind(extension.identifier.id, extension.extHostKind)
       }
     }
-    for (const extension of toRemove) {
-      extHostPicker.removeForcedExtensionHostKind(extension.identifier.id)
-    }
 
     await this._handleDeltaExtensions(new DeltaExtensionsQueueItem(toAdd, toRemove))
   }