source, and returns a text edit that correspond to the difference between the given
- * string and the formatted string.
- * - * It returns null if the given string cannot be formatted. - *
- *- * If the offset position is matching a whitespace, the result can include whitespaces. It would be up to - * the caller to get rid of preceding whitespaces. - *
- * - * @param kind - * Use to specify the kind of the code snippet to format. It can be any of these: - *null, then the platform
- * default one will be used.
- * @return the text edit
- * @throws IllegalArgumentException
- * if offset is lower than 0, length is lower than 0 or length is greater than source length.
- */
-
- LOG.debug("#starting to format by eclipse formatter");
- TextEdit edit = defaultCodeFormatter.format(
- CodeFormatter.K_COMPILATION_UNIT | CodeFormatter.F_INCLUDE_COMMENTS, text, startOffset,
- endOffset - startOffset, 0, Settings.LINE_SEPARATOR);
- if (edit != null) {
- LOG.debug("reformatting done");
- edit.apply(doc);
- } else {
- throw new FormattingFailedException(getErrorMessage(level));
- }
- return doc.get();
- } catch (BadLocationException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/EclipseAdapter44/src/krasa/formatter/adapter/EclipseJsFormatterAdapter44.java b/EclipseAdapter44/src/krasa/formatter/adapter/EclipseJsFormatterAdapter44.java
deleted file mode 100644
index f3ed50c..0000000
--- a/EclipseAdapter44/src/krasa/formatter/adapter/EclipseJsFormatterAdapter44.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package krasa.formatter.adapter;
-
-import com.intellij.pom.java.LanguageLevel;
-import krasa.formatter.eclipse.EclipseFormatterAdapter;
-import krasa.formatter.exception.FileDoesNotExistsException;
-import krasa.formatter.exception.FormattingFailedException;
-import krasa.formatter.settings.Settings;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
-
-import java.util.Map;
-
-@SuppressWarnings("Duplicates")
-public class EclipseJsFormatterAdapter44 extends EclipseFormatterAdapter {
-
- protected DefaultCodeFormatter defaultCodeFormatter;
-
- @SuppressWarnings("unused")
- public EclipseJsFormatterAdapter44(Map options) {
- defaultCodeFormatter = new DefaultCodeFormatter(options);
- }
-
- @Override
- public String format(String text, int startOffset, int endOffset, LanguageLevel level)
- throws FileDoesNotExistsException {
-
- LOG.debug("#formatInternal");
- if (endOffset > text.length()) {
- endOffset = text.length();
- }
- IDocument doc = new Document();
- try {
- doc.set(text);
- /**
- * Format source, and returns a text edit that correspond to the difference between the given
- * string and the formatted string.
- * - * It returns null if the given string cannot be formatted. - *
- *- * If the offset position is matching a whitespace, the result can include whitespaces. It would be up to - * the caller to get rid of preceding whitespaces. - *
- * - * @param kind - * Use to specify the kind of the code snippet to format. It can be any of these: - *null, then the platform
- * default one will be used.
- * @return the text edit
- * @throws IllegalArgumentException
- * if offset is lower than 0, length is lower than 0 or length is greater than source length.
- */
-
- LOG.debug("#starting to format by eclipse formatter");
- TextEdit edit = defaultCodeFormatter.format(
- CodeFormatter.K_COMPILATION_UNIT | CodeFormatter.F_INCLUDE_COMMENTS, text, startOffset,
- endOffset - startOffset, 0, Settings.LINE_SEPARATOR);
- if (edit != null) {
- LOG.debug("reformatting done");
- edit.apply(doc);
- } else {
- throw new FormattingFailedException(getErrorMessage(level));
- }
- return doc.get();
- } catch (BadLocationException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/EclipseAdapter44/src/krasa/formatter/adapter/JSCodeFormatterFacade.java b/EclipseAdapter44/src/krasa/formatter/adapter/JSCodeFormatterFacade.java
deleted file mode 100644
index 5e83ba1..0000000
--- a/EclipseAdapter44/src/krasa/formatter/adapter/JSCodeFormatterFacade.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package krasa.formatter.adapter;
-
-import krasa.formatter.common.ModifiableFile;
-import krasa.formatter.eclipse.CodeFormatterFacade;
-import krasa.formatter.exception.FileDoesNotExistsException;
-import krasa.formatter.exception.FormattingFailedException;
-import krasa.formatter.plugin.InvalidPropertyFile;
-import krasa.formatter.settings.Settings;
-import krasa.formatter.settings.provider.JSPropertiesProvider;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-
-import com.intellij.psi.PsiFile;
-
-/**
- * @author Vojtech Krasa
- */
-public class JSCodeFormatterFacade extends CodeFormatterFacade {
- protected org.eclipse.wst.jsdt.core.formatter.CodeFormatter codeFormatter;
-
- private JSPropertiesProvider propertiesProvider;
- protected ModifiableFile.Monitor modifiedMonitor;
-
- public JSCodeFormatterFacade(JSPropertiesProvider propertiesProvider) {
- this.propertiesProvider = propertiesProvider;
- }
-
- private org.eclipse.wst.jsdt.core.formatter.CodeFormatter getCodeFormatter() throws FileDoesNotExistsException {
- if (codeFormatter == null || propertiesProvider.wasChanged(modifiedMonitor)) {
- return newCodeFormatter();
- }
- return codeFormatter;
- }
-
- private org.eclipse.wst.jsdt.core.formatter.CodeFormatter newCodeFormatter() throws InvalidPropertyFile {
- modifiedMonitor = propertiesProvider.getModifiedMonitor();
- codeFormatter = org.eclipse.wst.jsdt.core.ToolFactory.createCodeFormatter(propertiesProvider.get());
- return codeFormatter;
- }
-
- @Override
- public String format(String text, int startOffset, int endOffset, PsiFile psiFile)
- throws FileDoesNotExistsException {
- IDocument doc = new Document();
- try {
- // format the file (the meat and potatoes)
- doc.set(text);
- /**
- * Format source, and returns a text edit that correspond to the difference between the given
- * string and the formatted string.
- * - * It returns null if the given string cannot be formatted. - *
- * - *- * If the offset position is matching a whitespace, the result can include whitespaces. It would be up to - * the caller to get rid of preceeding whitespaces. - *
- * - * @param kind - * Use to specify the kind of the code snippet to format. It can be any of these: K_EXPRESSION, - * K_STATEMENTS, K_CLASS_BODY_DECLARATIONS, K_JAVASCRIPT_UNIT, K_UNKNOWN, K_SINGLE_LINE_COMMENT, - * K_MULTI_LINE_COMMENT, K_JAVA_DOC - * @param source - * the source to format - * @param offset - * the given offset to start recording the edits (inclusive). - * @param length - * the given length to stop recording the edits (exclusive). - * @param indentationLevel - * the initial indentation level, used to shift left/right the entire source fragment. An initial - * indentation level of zero or below has no effect. - * @param lineSeparator - * the line separator to use in formatted source, if set tonull, then the platform
- * default one will be used.
- * @return the text edit
- * @throws IllegalArgumentException
- * if offset is lower than 0, length is lower than 0 or length is greater than source length.
- */
- TextEdit edit = getCodeFormatter().format(CodeFormatter.K_JAVASCRIPT_UNIT, text, startOffset,
- endOffset - startOffset, 0, Settings.LINE_SEPARATOR);
- if (edit != null) {
- edit.apply(doc);
- } else {
- throw new FormattingFailedException();
- }
-
- return doc.get();
- } catch (BadLocationException e) {
- throw new RuntimeException(e);
- }
- }
-
- public String format(String text, int startOffset, int endOffset, int kJavascriptUnit)
- throws FileDoesNotExistsException {
- IDocument doc = new Document();
- try {
- // format the file (the meat and potatoes)
- doc.set(text);
- /**
- * Format source, and returns a text edit that correspond to the difference between the given
- * string and the formatted string.
- * - * It returns null if the given string cannot be formatted. - *
- * - *- * If the offset position is matching a whitespace, the result can include whitespaces. It would be up to - * the caller to get rid of preceeding whitespaces. - *
- * - * @param kind - * Use to specify the kind of the code snippet to format. It can be any of these: K_EXPRESSION, - * K_STATEMENTS, K_CLASS_BODY_DECLARATIONS, K_JAVASCRIPT_UNIT, K_UNKNOWN, K_SINGLE_LINE_COMMENT, - * K_MULTI_LINE_COMMENT, K_JAVA_DOC - * @param source - * the source to format - * @param offset - * the given offset to start recording the edits (inclusive). - * @param length - * the given length to stop recording the edits (exclusive). - * @param indentationLevel - * the initial indentation level, used to shift left/right the entire source fragment. An initial - * indentation level of zero or below has no effect. - * @param lineSeparator - * the line separator to use in formatted source, if set tonull, then the platform
- * default one will be used.
- * @return the text edit
- * @throws IllegalArgumentException
- * if offset is lower than 0, length is lower than 0 or length is greater than source length.
- */
- TextEdit edit = getCodeFormatter().format(kJavascriptUnit, text, startOffset, endOffset - startOffset, 0,
- Settings.LINE_SEPARATOR);
- if (edit != null) {
- edit.apply(doc);
- } else {
- throw new FormattingFailedException();
- }
-
- return doc.get();
- } catch (BadLocationException e) {
- throw new RuntimeException(e);
- }
- }
-
- public TextEdit format(int kind, String source, int offset, int length, int indentationLevel,
- String lineSeparator) {
- return getCodeFormatter().format(kind, source, offset, length, indentationLevel, lineSeparator);
- }
-}
diff --git a/EclipseAdapter44/src/krasa/formatter/adapter/JsniFormattingUtil.java b/EclipseAdapter44/src/krasa/formatter/adapter/JsniFormattingUtil.java
deleted file mode 100644
index 0584bf3..0000000
--- a/EclipseAdapter44/src/krasa/formatter/adapter/JsniFormattingUtil.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright 2011 Google Inc. All Rights Reserved.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *******************************************************************************/
-package krasa.formatter.adapter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import krasa.formatter.plugin.Range;
-import krasa.formatter.settings.Settings;
-
-import org.eclipse.jdt.core.formatter.IndentManipulation;
-import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
-import org.eclipse.jface.text.*;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.ToolFactory;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-
-import com.google.gwt.eclipse.core.editors.java.GWTPartitions;
-import com.google.gwt.eclipse.core.validators.java.JsniParser;
-
-/**
- * Utility methods for formatting JSNI methods. This is not a full-blown JavaScript pretty-printer, but it does apply
- * the correct outer indentation to JSNI blocks, to correct the JDT bug which slides them to the right.
- */
-@SuppressWarnings("restriction")
-public class JsniFormattingUtil {
-
- private static class JsniJavaRefReplacementResult {
- private String jsni;
- private Map