Attachment 101239 Details for Bug 232466 – New proposed patch after Maxime's review

[patch] New proposed patch after Maxime's review

v03.txt (text/plain), 5.60 KB, created by Frederic Fusier

on 2008-05-21 08:30:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2008-05-21 08:30:34 EDT

Size: 5.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.137
>diff -u -r1.137 Scribe.java
>--- formatter/org/eclipse/jdt/internal/formatter/Scribe.java	20 May 2008 13:12:46 -0000	1.137
>+++ formatter/org/eclipse/jdt/internal/formatter/Scribe.java	21 May 2008 12:08:08 -0000
>@@ -2411,14 +2411,17 @@
> 				switch (token) {
> 					case TerminalTokens.TokenNameWHITESPACE:
> 						if (previousToken != -1 || tokenLength > 1 || this.scanner.currentCharacter != ' ') needFormat = true;
>-						if (previousToken == -1) { // space before reference
>-							buffer.append(' ');
>-							this.column++;
>-						}
>-						if (previousToken == TerminalTokens.TokenNameCOMMA) { // space between method arguments
>-							spacePosition = buffer.length();
>-							buffer.append(' ');
>-							this.column++; // space before reference
>+						switch (previousToken) {
>+							case TerminalTokens.TokenNameMULTIPLY :
>+							case TerminalTokens.TokenNameLPAREN:
>+								break;
>+							default:	// space between method arguments
>+								spacePosition = buffer.length();
>+								// fall through next case
>+							case -1:
>+								buffer.append(' ');
>+								this.column++;
>+								break;
> 						}
> 						break;
> 					case TerminalTokens.TokenNameMULTIPLY:
>#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.4
>diff -u -r1.4 FormatterCommentsBugsTest.java
>--- src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	20 May 2008 13:12:48 -0000	1.4
>+++ src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	21 May 2008 12:08:09 -0000
>@@ -174,4 +174,18 @@
> 	this.preferences.comment_line_length = 40;
> 	formatUnit("bugs.b232488", "X01.java");
> }
>+
>+/**
>+ * @bug 232466: [formatter] References of inlined tags are still split in certain circumstances
>+ * @test Insure that new formatter do not add/remove stars in header and footer
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=232466"
>+ */
>+public void testBug233466a() throws JavaModelException {
>+	this.preferences.comment_line_length = 40;
>+	formatUnit("bugs.b232466", "X01.java");
>+}
>+public void testBug233466b() throws JavaModelException {
>+	this.preferences.comment_line_length = 40;
>+	formatUnit("bugs.b232466", "X02.java");
>+}
> }
>Index: workspace/FormatterJavadoc/test/bugs/b232466/out/X01.java
>===================================================================
>RCS file: workspace/FormatterJavadoc/test/bugs/b232466/out/X01.java
>diff -N workspace/FormatterJavadoc/test/bugs/b232466/out/X01.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/FormatterJavadoc/test/bugs/b232466/out/X01.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,6 @@
>+/**
>+ * {@link SearchEngine#searchAllTypeNames(char[] packageName, int packageMatchRule, char[] typeName, int typeMatchRule, int searchFor, IJavaSearchScope scope, TypeNameMatchRequestor nameMatchRequestor, int waitingPolicy, org.eclipse.core.runtime.IProgressMonitor monitor)}
>+ */
>+public class X01 {
>+
>+}
>Index: workspace/FormatterJavadoc/test/bugs/b232466/X02.java
>===================================================================
>RCS file: workspace/FormatterJavadoc/test/bugs/b232466/X02.java
>diff -N workspace/FormatterJavadoc/test/bugs/b232466/X02.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/FormatterJavadoc/test/bugs/b232466/X02.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,18 @@
>+/**
>+ * {@link LocalClass02#searchAllTypeNames(
>+ *		char[] 
>+ *			packageName, 
>+ *		int 
>+ *			packageMatchRule, 
>+ *		char[] 
>+ *			typeName)}
>+ */
>+public class X02 {
>+
>+}
>+
>+class LocalClass02 {
>+	void searchAllTypeNames(char[] packageName, int packageMatchRule,
>+			char[] typeName) {
>+	}
>+}
>Index: workspace/FormatterJavadoc/test/bugs/b232466/X01.java
>===================================================================
>RCS file: workspace/FormatterJavadoc/test/bugs/b232466/X01.java
>diff -N workspace/FormatterJavadoc/test/bugs/b232466/X01.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/FormatterJavadoc/test/bugs/b232466/X01.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,15 @@
>+/**
>+ * {@link SearchEngine#searchAllTypeNames(
>+ *		char[] packageName, 
>+ *		int packageMatchRule, 
>+ *		char[] typeName,
>+ *		int typeMatchRule, 
>+ *		int searchFor, 
>+ *		IJavaSearchScope scope, 
>+ *		TypeNameMatchRequestor nameMatchRequestor,
>+ *		int waitingPolicy,
>+ * 		org.eclipse.core.runtime.IProgressMonitor monitor)}
>+ */
>+public class X01 {
>+
>+}
>Index: workspace/FormatterJavadoc/test/bugs/b232466/out/X02.java
>===================================================================
>RCS file: workspace/FormatterJavadoc/test/bugs/b232466/out/X02.java
>diff -N workspace/FormatterJavadoc/test/bugs/b232466/out/X02.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/FormatterJavadoc/test/bugs/b232466/out/X02.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,12 @@
>+/**
>+ * {@link LocalClass02#searchAllTypeNames(char[] packageName, int packageMatchRule, char[] typeName)}
>+ */
>+public class X02 {
>+
>+}
>+
>+class LocalClass02 {
>+	void searchAllTypeNames(char[] packageName, int packageMatchRule,
>+			char[] typeName) {
>+	}
>+}

Actions: View | Diff

Attachments on bug 232466: 100624 | 100815 | 101206 | 101239