Apply all edits to document as single modification

Author: angelozerr

core/ts.core/src/ts/client/codefixes/CodeAction.java

@@ -1,3 +1,13 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.client.codefixes;
 
 import java.util.List;
@@ -8,11 +18,11 @@ public class CodeAction {
 	private String description;
 	/** Text changes to apply to each file as part of the code action */
 	private List<FileCodeEdits> changes;
-	
+
 	public String getDescription() {
 		return description;
 	}
-	
+
 	public List<FileCodeEdits> getChanges() {
 		return changes;
 	}

core/ts.core/src/ts/client/codefixes/FileCodeEdits.java

@@ -1,3 +1,13 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.client.codefixes;
 
 import java.util.List;

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/format/TypeScriptContentFormatter.java

@@ -45,8 +45,7 @@ public void format(IDocument document, IRegion region) {
 					@Override
 					public void run() {
 						try {
-							TextEdit textEdit = DocumentUtils.toTextEdit(codeEdits, document);
-							textEdit.apply(document, TextEdit.CREATE_UNDO);
+							DocumentUtils.applyEdits(document, codeEdits);
 						} catch (Exception e) {
 							IStatus status = new Status(IStatus.ERROR, JSDTTypeScriptUIPlugin.PLUGIN_ID, e.getMessage(),
 									e);

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/utils/DocumentUtils.java

@@ -6,9 +6,12 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.text.edits.DeleteEdit;
 import org.eclipse.text.edits.InsertEdit;
+import org.eclipse.text.edits.MalformedTreeException;
 import org.eclipse.text.edits.MultiTextEdit;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.text.edits.TextEdit;
+import org.eclipse.text.undo.DocumentUndoManagerRegistry;
+import org.eclipse.text.undo.IDocumentUndoManager;
 
 import ts.TypeScriptException;
 import ts.client.CodeEdit;
@@ -31,13 +34,40 @@ public static int getPosition(IDocument document, int line, int offset) throws T
 		}
 	}
 
-	public static TextEdit toTextEdit(CodeEdit codeEdit, IDocument document) throws TypeScriptException {
-		MultiTextEdit textEdit = new MultiTextEdit();
-		toTextEdit(codeEdit, document, textEdit);
-		return textEdit;
+	/**
+	 * Method will apply all edits to document as single modification. Needs to
+	 * be executed in UI thread.
+	 * 
+	 * @param document
+	 *            document to modify
+	 * @param edits
+	 *            list of TypeScript {@link CodeEdit}.
+	 * @throws TypeScriptException
+	 * @throws BadLocationException
+	 * @throws MalformedTreeException
+	 */
+	public static void applyEdits(IDocument document, List<CodeEdit> codeEdits)
+			throws TypeScriptException, MalformedTreeException, BadLocationException {
+		if (document == null || codeEdits.isEmpty()) {
+			return;
+		}
+
+		IDocumentUndoManager manager = DocumentUndoManagerRegistry.getDocumentUndoManager(document);
+		if (manager != null) {
+			manager.beginCompoundChange();
+		}
+
+		try {
+			TextEdit edit = toTextEdit(codeEdits, document);
+			edit.apply(document);
+		} finally {
+			if (manager != null) {
+				manager.endCompoundChange();
+			}
+		}
 	}
 
-	public static TextEdit toTextEdit(List<CodeEdit> codeEdits, IDocument document) throws TypeScriptException {
+	private static TextEdit toTextEdit(List<CodeEdit> codeEdits, IDocument document) throws TypeScriptException {
 		MultiTextEdit textEdit = new MultiTextEdit();
 		for (CodeEdit codeEdit : codeEdits) {
 			toTextEdit(codeEdit, document, textEdit);

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/hover/CodeActionCompletionProposal.java

@@ -15,11 +15,11 @@
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.TextEdit;
 
 import ts.client.codefixes.CodeAction;
 import ts.client.codefixes.FileCodeEdits;
 import ts.eclipse.ide.core.utils.DocumentUtils;
+import ts.eclipse.ide.ui.TypeScriptUIPlugin;
 
 /**
  * TypeScript {@link CodeAction} completion proposal.
@@ -42,11 +42,11 @@ public void apply(IDocument document) {
 
 	private void apply(FileCodeEdits codeEdits, IDocument document) {
 		String fileName = codeEdits.getFileName();
+		// TODO: support code edit for the given file name.
 		try {
-			TextEdit textEdit = DocumentUtils.toTextEdit(codeEdits.getTextChanges(), document);
-			textEdit.apply(document, TextEdit.CREATE_UNDO);
+			DocumentUtils.applyEdits(document, codeEdits.getTextChanges());
 		} catch (Exception e) {
-			e.printStackTrace();
+			TypeScriptUIPlugin.log(e);
 		}
 	}