Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilos Kleint2010-12-30 09:11:22 -0500
committerMilos Kleint2010-12-30 09:11:22 -0500
commit74ff28e9d59c3fb535d12b671b8467a743b62836 (patch)
tree8668cc530a3501e240ebecdc44279b49bca32b45
parent5a4e897f61d8a3e9879e210080858d9056f009f8 (diff)
downloadm2e-core-74ff28e9d59c3fb535d12b671b8467a743b62836.tar.gz
m2e-core-74ff28e9d59c3fb535d12b671b8467a743b62836.tar.xz
m2e-core-74ff28e9d59c3fb535d12b671b8467a743b62836.zip
fix formatting in the generator, rely on FormatProcessorXML class to do the job. fixes the indentation of the generated blocks..
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java35
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomContentAssistProcessor.java11
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomStructuredTextViewConfiguration.java2
3 files changed, 23 insertions, 25 deletions
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
index 33075a05..26a3cc77 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java
@@ -11,6 +11,7 @@
package org.eclipse.m2e.editor.xml;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -22,6 +23,7 @@ import org.apache.maven.project.MavenProject;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
@@ -35,7 +37,9 @@ import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
+import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
import org.eclipse.m2e.core.core.MavenLogger;
import org.eclipse.m2e.core.embedder.ArtifactKey;
@@ -52,14 +56,12 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
private int generatedLength = 0;
private int generatedOffset;
private Configuration config;
- private PomStructuredTextViewConfiguration textConfig;
- public InsertArtifactProposal(ISourceViewer sourceViewer, Region region, Configuration config, PomStructuredTextViewConfiguration config2) {
+ public InsertArtifactProposal(ISourceViewer sourceViewer, Region region, Configuration config) {
this.sourceViewer = sourceViewer;
this.region = region;
generatedOffset = region.getOffset();
this.config = config;
- this.textConfig = config2;
assert config.getType() != null;
}
@@ -126,8 +128,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generatedLength = buffer.toString().length();
document.replace(offset, region.getLength(), buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, generatedOffset, generatedLength);
+ Region resRegion = format(document, generatedOffset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch(BadLocationException e) {
@@ -149,8 +150,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generatedLength = buffer.toString().length();
document.replace(offset, 0, buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, generatedOffset, generatedLength);
+ Region resRegion = format(document, generatedOffset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch (BadLocationException e) {
@@ -174,8 +174,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generatedLength = buffer.toString().length();
document.replace(offset, 0, buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, offset, generatedLength);
+ Region resRegion = format(document, offset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch (BadLocationException e) {
@@ -197,8 +196,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generateArtifact(config.getType(), buffer, lineDelim, af, skipVersion(current, af, managedKeys, config.getType()));
generatedLength = buffer.toString().length();
document.replace(offset, 0, buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, offset, generatedLength);
+ Region resRegion = format(document, offset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch (BadLocationException e) {
@@ -220,8 +218,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generatedLength = buffer.toString().length();
document.replace(offset, 0, buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, generatedOffset, generatedLength);
+ Region resRegion = format(document, generatedOffset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch (BadLocationException e) {
@@ -243,8 +240,7 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
generateArtifact(config.getType(), buffer, lineDelim, af, skipVersion(current, af, managedKeys, config.getType()));
generatedLength = buffer.toString().length();
document.replace(offset, 0, buffer.toString());
- IContentFormatter formatter = textConfig.getContentFormatter(sourceViewer);
- Region resRegion = format(formatter, document, offset, generatedLength);
+ Region resRegion = format(document, offset, generatedLength);
generatedOffset = resRegion.getOffset();
generatedLength = resRegion.getLength();
} catch (BadLocationException e) {
@@ -311,11 +307,16 @@ public class InsertArtifactProposal implements ICompletionProposal, ICompletionP
* operates on whole line (determined by the region specified)
* returns the new region encompassing the original region after formatting
*/
- public static Region format(IContentFormatter formatter, IDocument document, int offset, int length) throws BadLocationException {
+ public static Region format(IDocument document, int offset, int length) throws BadLocationException {
int startLine = document.getLineOfOffset(offset);
int endLine = document.getLineOfOffset(offset + length - 1); // -1 to make sure to be before the end of line char
int startLineOffset = document.getLineOffset(startLine);
- formatter.format(document, new Region(startLineOffset, (document.getLineOffset(endLine) + document.getLineLength(endLine)) - startLineOffset));
+ try {
+ new FormatProcessorXML().formatDocument(document, offset, length);
+ } catch(Exception e) {
+ MavenLogger.log("Failed to format generated code", e);
+ }
+// formatter.format(document, new Region(startLineOffset, (document.getLineOffset(endLine) + document.getLineLength(endLine)) - startLineOffset));
startLineOffset = document.getLineOffset(startLine); //should be same, just being paranoid
return new Region (startLineOffset, (document.getLineOffset(endLine) + document.getLineLength(endLine)) - startLineOffset);
}
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomContentAssistProcessor.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomContentAssistProcessor.java
index 656a056d..75a5fae3 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomContentAssistProcessor.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomContentAssistProcessor.java
@@ -69,11 +69,8 @@ public class PomContentAssistProcessor extends XMLContentAssistProcessor {
private ISourceViewer sourceViewer;
- private PomStructuredTextViewConfiguration textConfig;
-
- public PomContentAssistProcessor(ISourceViewer sourceViewer, PomStructuredTextViewConfiguration pomStructuredTextViewConfiguration) {
+ public PomContentAssistProcessor(ISourceViewer sourceViewer) {
this.sourceViewer = sourceViewer;
- textConfig = pomStructuredTextViewConfiguration;
}
//broken
@@ -272,7 +269,7 @@ public class PomContentAssistProcessor extends XMLContentAssistProcessor {
InsertArtifactProposal.Configuration config = new InsertArtifactProposal.Configuration(InsertArtifactProposal.SearchType.DEPENDENCY);
config.setCurrentNode(node);
- ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config, this.textConfig);
+ ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config);
if(request.shouldSeparate()) {
request.addMacro(proposal);
} else {
@@ -287,7 +284,7 @@ public class PomContentAssistProcessor extends XMLContentAssistProcessor {
InsertArtifactProposal.Configuration config = new InsertArtifactProposal.Configuration(InsertArtifactProposal.SearchType.PLUGIN);
config.setCurrentNode(node);
- ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config, this.textConfig);
+ ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config);
if(request.shouldSeparate()) {
request.addMacro(proposal);
} else {
@@ -311,7 +308,7 @@ public class PomContentAssistProcessor extends XMLContentAssistProcessor {
}
InsertArtifactProposal.Configuration config = new InsertArtifactProposal.Configuration(InsertArtifactProposal.SearchType.PARENT);
config.setInitiaSearchString(groupString);
- ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config, this.textConfig);
+ ICompletionProposal proposal = new InsertArtifactProposal(sourceViewer, region, config);
if(request.shouldSeparate()) {
request.addMacro(proposal);
} else {
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomStructuredTextViewConfiguration.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomStructuredTextViewConfiguration.java
index 5f5b26b1..38e043a6 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomStructuredTextViewConfiguration.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomStructuredTextViewConfiguration.java
@@ -28,7 +28,7 @@ public class PomStructuredTextViewConfiguration extends StructuredTextViewerConf
@Override
public IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
if(partitionType == IStructuredPartitions.DEFAULT_PARTITION || partitionType == IXMLPartitions.XML_DEFAULT) {
- return new IContentAssistProcessor[] {new PomContentAssistProcessor(sourceViewer, this)};
+ return new IContentAssistProcessor[] {new PomContentAssistProcessor(sourceViewer)};
}
return super.getContentAssistProcessors(sourceViewer, partitionType);
}

Back to the top