From 901adec7f6b9d5372de49112ec388ba9007ef4d9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 4 Jan 2022 14:47:28 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee

---
 app/assets/javascripts/editor/source_editor_instance.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/editor/source_editor_instance.js b/app/assets/javascripts/editor/source_editor_instance.js
index 8372a59964b..95a43c2b2d0 100644
--- a/app/assets/javascripts/editor/source_editor_instance.js
+++ b/app/assets/javascripts/editor/source_editor_instance.js
@@ -50,6 +50,10 @@ const utils = {
     }
     return extensionsStore.get(extensionName);
   },
+
+  hasFullApiRegistered: (targetMethods, newMethods) => {
+    return newMethods.find((fn) => !targetMethods.includes(fn)) === undefined;
+  },
 };
 
 /** Class representing a Source Editor Instance */
@@ -132,7 +136,9 @@ export default class EditorInstance {
     const existingExt = utils.getStoredExtension(extensionsStore, definition.extensionName);
     if (existingExt) {
       if (isEqual(extension.setupOptions, existingExt.setupOptions)) {
-        return existingExt;
+        if (utils.hasFullApiRegistered(this.extensionsAPI, Object.keys(existingExt.api))) {
+          return existingExt;
+        }
       }
       this.unuseExtension(extensionsStore, existingExt);
     }
-- 
cgit v1.2.1