Merge pull request #187683 from microsoft/joh/fix/187642

Make sure to register the actual disposable that's for the exclusive …

src/vs/editor/contrib/snippet/browser/snippetController2.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { assertType } from 'vs/base/common/types';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorCommand, EditorContributionInstantiation, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
@@ -188,10 +188,10 @@ export class SnippetController2 implements IEditorContribution {
 
 			const model = this._editor.getModel();
 
-			let registration: IDisposable = Disposable.None;
+			let registration: IDisposable | undefined;
 			let isRegistered = false;
 			const disable = () => {
-				registration.dispose();
+				registration?.dispose();
 				isRegistered = false;
 			};
 
@@ -203,11 +203,11 @@ export class SnippetController2 implements IEditorContribution {
 						scheme: model.uri.scheme,
 						exclusive: true
 					}, provider);
+					this._snippetListener.add(registration);
 					isRegistered = true;
 				}
 			};
 
-			this._snippetListener.add(registration);
 			this._choiceCompletions = { provider, enable, disable };
 		}