summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2014-03-02 14:38:40 (EST)
committerJuergen Haug2014-03-02 14:38:40 (EST)
commit30a053f3c583acae50d793c04f99fa0ff9984c48 (patch)
treeea899ad54800483fd23d81c205b0f995815d3d5d
parent1f81f9e363e580b505f77ccfb92dd98b000e34b4 (diff)
downloadorg.eclipse.etrice-30a053f3c583acae50d793c04f99fa0ff9984c48.zip
org.eclipse.etrice-30a053f3c583acae50d793c04f99fa0ff9984c48.tar.gz
org.eclipse.etrice-30a053f3c583acae50d793c04f99fa0ff9984c48.tar.bz2
[core] formatting: removed fixed line breaks for commentsrefs/changes/30/22730/1
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/formatting/RoomFormatter.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/formatting/RoomFormatter.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/formatting/RoomFormatter.java
index 46bfae0..caeed63 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/formatting/RoomFormatter.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/formatting/RoomFormatter.java
@@ -37,8 +37,9 @@ public class RoomFormatter extends AbstractDeclarativeFormatter {
// general
c.setAutoLinewrap(120);
- c.setLinewrap(2).before(f.getSL_COMMENTRule());
- c.setLinewrap(2).before(f.getML_COMMENTRule());
+ c.setLinewrap(0, 1, 2).before(f.getSL_COMMENTRule());
+ c.setLinewrap(0, 1, 2).before(f.getML_COMMENTRule());
+ c.setLinewrap(0, 1, 1).after(f.getML_COMMENTRule());
for (Pair<Keyword, Keyword> pair : f.findKeywordPairs("{", "}")) {
c.setLinewrap().after(pair.getFirst());
@@ -48,7 +49,7 @@ public class RoomFormatter extends AbstractDeclarativeFormatter {
c.setSpace(" ").between(pair.getFirst(), pair.getSecond());
}
- for (Keyword k: f.findKeywords("(", "|", ".", "*", "/")) {
+ for (Keyword k: f.findKeywords("(", "|", ".", "*")) {
c.setNoSpace().around(k);
}
@@ -66,6 +67,7 @@ public class RoomFormatter extends AbstractDeclarativeFormatter {
c.setLinewrap(2).around(f.getImportRule());
+ c.setNoSpace().around(f.getRefPathAccess().getSolidusKeyword_1_0());
// classes
c.setLinewrap(2).around(f.getLogicalSystemRule());