### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java,v
retrieving revision 1.8
diff -u -r1.8 FormatterCommentsBugsTest.java
--- src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	22 May 2008 15:44:18 -0000	1.8
+++ src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	22 May 2008 18:03:41 -0000
@@ -76,6 +76,19 @@
 }
 
 /**
+ * @bug 230944: [formatter] Formatter does not respect /*-
+ * @test Ensure that new formatter does not format block comment starting with '/*-'
+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=230944"
+ */
+public void testBug230944a() throws JavaModelException {
+	formatUnit("bugs.b230944", "X01.java");
+}
+public void testBug230944b() throws JavaModelException {
+	this.preferences.comment_line_length = 40;
+	formatUnit("bugs.b230944", "X02.java");
+}
+
+/**
  * @bug 231263: [formatter] New JavaDoc formatter wrongly indent tags description
  * @test Ensure that new formatter indent tags description as the old one
  * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=231263"
Index: workspace/FormatterJavadoc/test/bugs/b230944/out/X02.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/bugs/b230944/out/X02.java
diff -N workspace/FormatterJavadoc/test/bugs/b230944/out/X02.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/bugs/b230944/out/X02.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+public class X02 {
+
+	/*-
+	 * Foo           bar
+	 */
+}
Index: workspace/FormatterJavadoc/test/bugs/b230944/X02.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/bugs/b230944/X02.java
diff -N workspace/FormatterJavadoc/test/bugs/b230944/X02.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/bugs/b230944/X02.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+public class X02 {
+
+/*-
+ * Foo           bar
+ */
+}
Index: workspace/FormatterJavadoc/test/bugs/b230944/X01.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/bugs/b230944/X01.java
diff -N workspace/FormatterJavadoc/test/bugs/b230944/X01.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/bugs/b230944/X01.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+public class X01 {
+
+/*- 
+ * Foo           bar
+ */
+}
Index: workspace/FormatterJavadoc/test/bugs/b230944/out/X01.java
===================================================================
RCS file: workspace/FormatterJavadoc/test/bugs/b230944/out/X01.java
diff -N workspace/FormatterJavadoc/test/bugs/b230944/out/X01.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/FormatterJavadoc/test/bugs/b230944/out/X01.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,6 @@
+public class X01 {
+
+	/*- 
+	 * Foo           bar
+	 */
+}
#P org.eclipse.jdt.core
Index: formatter/org/eclipse/jdt/internal/formatter/Scribe.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/Scribe.java,v
retrieving revision 1.140
diff -u -r1.140 Scribe.java
--- formatter/org/eclipse/jdt/internal/formatter/Scribe.java	22 May 2008 15:44:16 -0000	1.140
+++ formatter/org/eclipse/jdt/internal/formatter/Scribe.java	22 May 2008 18:03:42 -0000
@@ -1303,6 +1303,7 @@
 						this.lastNumberOfNewLines = 0;
 						needSpace = false;
 						this.scanner.skipComments = false;
+						this.scanner.resetTo(currentTokenStartPosition, currentTokenEndPosition - 1);
 						return false;
 					}
 			}