From 8b86237a81252f15cb7c87286c0faf20403d85ba Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 12 May 2017 11:33:36 +0200
Subject: [PATCH] wire up new controller and main thread editor

---
 .../api/electron-browser/mainThreadEditor.ts     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts
index 601e99fa376..cd44f6778a1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts
@@ -11,7 +11,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { Selection, ISelection } from 'vs/editor/common/core/selection';
-import { SnippetController } from 'vs/editor/contrib/snippet/common/snippetController';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
 import { TextEditorCursorStyle, cursorStyleToString } from 'vs/editor/common/config/editorOptions';
 import { ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
@@ -361,10 +361,10 @@ export class MainThreadTextEditor {
 			return false;
 		}
 
-		const snippetController = SnippetController.get(this._codeEditor);
+		const snippetController = SnippetController2.get(this._codeEditor);
 
-		// cancel previous snippet mode
-		snippetController.leaveSnippet();
+		// // cancel previous snippet mode
+		// snippetController.leaveSnippet();
 
 		// set selection, focus editor
 		const selections = ranges.map(r => new Selection(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn));
@@ -372,13 +372,7 @@ export class MainThreadTextEditor {
 		this._codeEditor.focus();
 
 		// make modifications
-		if (opts.undoStopBefore) {
-			this._codeEditor.pushUndoStop();
-		}
-		snippetController.insertSnippet(template, 0, 0);
-		if (opts.undoStopAfter) {
-			this._codeEditor.pushUndoStop();
-		}
+		snippetController.insert(template, 0, 0, opts.undoStopBefore, opts.undoStopAfter);
 
 		return true;
 	}
-- 
GitLab