Consumes tsserver "format" command to format. See

#36

Author: angelozerr

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/TypeScriptSourceViewerConfiguration.java

@@ -28,8 +28,8 @@
 import org.eclipse.wst.jsdt.ui.text.JavaScriptSourceViewerConfiguration;
 
 import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptCompletionProcessor;
-import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptContentAssistInvocationContext;
 import ts.eclipse.ide.jsdt.internal.ui.editor.format.TypeScriptContentFormatter;
+import ts.eclipse.ide.ui.utils.EditorUtils;
 
 /**
  * Extension of JSDT {@link JavaScriptSourceViewerConfiguration}
@@ -101,6 +101,6 @@ private IDialogSettings getSettings(final String sectionName) {
 
 	@Override
 	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		return new TypeScriptContentFormatter(getEditor());
+		return new TypeScriptContentFormatter(EditorUtils.getResource(getEditor()));
 	}
 }

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

@@ -1,20 +1,74 @@
 package ts.eclipse.ide.jsdt.internal.ui.editor.format;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.DocumentRewriteSession;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.formatter.IContentFormatter;
 import org.eclipse.jface.text.formatter.IFormattingStrategy;
-import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.text.edits.DeleteEdit;
+import org.eclipse.text.edits.InsertEdit;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.text.edits.TextEdit;
 
+import ts.TypeScriptException;
+import ts.client.format.ITypeScriptFormatCollector;
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
+import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
+import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
+
+/**
+ * Content formatter which consumes tsserver "format" command to format an
+ * IDocument.
+ * 
+ * @author azerr
+ *
+ */
 public class TypeScriptContentFormatter implements IContentFormatter {
 
-	public TypeScriptContentFormatter(ITextEditor editor) {
-		// TODO Auto-generated constructor stub
+	private final IResource resource;
+	private DocumentRewriteSession fRewriteSession;
+
+	public TypeScriptContentFormatter(IResource resource) {
+		this.resource = resource;
 	}
 
 	@Override
 	public void format(IDocument document, IRegion region) {
-		System.err.println(document.get());
+		try {
+			IIDETypeScriptProject tsProject = TypeScriptCorePlugin.getDefault()
+					.getTypeScriptProject(resource.getProject());
+			final IIDETypeScriptFile tsFile = tsProject.openFile(resource, document);
+
+			final MultiTextEdit textEdit = new MultiTextEdit();
+			int startPosition = region.getOffset();
+			int endPosition = region.getOffset() + region.getLength() - 1;
+			tsFile.format(startPosition, endPosition, new ITypeScriptFormatCollector() {
+
+				@Override
+				public void format(int startLine, int startOffset, int endLine, int endOffset, String newText)
+						throws TypeScriptException {
+					int start = tsFile.getPosition(startLine, startOffset);
+					int end = tsFile.getPosition(endLine, endOffset);
+					int length = end - start;
+					if (newText.isEmpty()) {
+						if (length > 0) {
+							textEdit.addChild(new DeleteEdit(start, length));
+						}
+					} else {
+						if (length > 0) {
+							textEdit.addChild(new ReplaceEdit(start, length, newText));
+						} else if (length == 0) {
+							textEdit.addChild(new InsertEdit(start, newText));
+						}
+					}
+				}
+			});
+			textEdit.apply(document, TextEdit.CREATE_UNDO);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Override