Attachment 139436 Details for Bug 280616 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

v00.txt (text/plain), 4.66 KB, created by Frederic Fusier

on 2009-06-17 10:46:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2009-06-17 10:46:36 EDT

Size: 4.66 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.164
>diff -u -r1.164 Scribe.java
>--- formatter/org/eclipse/jdt/internal/formatter/Scribe.java	16 Jun 2009 15:17:55 -0000	1.164
>+++ formatter/org/eclipse/jdt/internal/formatter/Scribe.java	17 Jun 2009 14:41:41 -0000
>@@ -14,12 +14,16 @@
> import java.io.StringReader;
> import java.util.Arrays;
> import java.util.Comparator;
>+import java.util.Map;
> 
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.core.compiler.InvalidInputException;
> import org.eclipse.jdt.core.formatter.CodeFormatter;
> import org.eclipse.jdt.internal.compiler.ASTVisitor;
> import org.eclipse.jdt.internal.compiler.ast.Annotation;
>+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
> import org.eclipse.jdt.internal.compiler.parser.Parser;
> import org.eclipse.jdt.internal.compiler.parser.Scanner;
>@@ -1858,7 +1862,11 @@
> 		// 3 - format snippet (@see JavaDocRegion#formatCodeSnippet)
> 		// include comments in case of line comments are present in the snippet
> 		String formattedSnippet = convertedSnippet;
>-		TextEdit edit= CommentFormatterUtil.format2(CodeFormatter.K_UNKNOWN | CodeFormatter.F_INCLUDE_COMMENTS, convertedSnippet, 0, this.lineSeparator, this.formatter.preferences.getMap());
>+		Map options = this.formatter.preferences.getMap();
>+		if (this.scanner.sourceLevel > ClassFileConstants.JDK1_3) {
>+			options.put(JavaCore.COMPILER_SOURCE, CompilerOptions.versionFromJdkLevel(this.scanner.sourceLevel));
>+		}
>+		TextEdit edit= CommentFormatterUtil.format2(CodeFormatter.K_UNKNOWN | CodeFormatter.F_INCLUDE_COMMENTS, convertedSnippet, 0, this.lineSeparator, options);
> 		if (edit == null) {
> 			// 3.a - not a valid code to format, keep initial buffer
> 			formattedSnippet = inputBuffer.toString();
>#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.41
>diff -u -r1.41 FormatterCommentsBugsTest.java
>--- src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	16 Jun 2009 15:17:57 -0000	1.41
>+++ src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsBugsTest.java	17 Jun 2009 14:41:43 -0000
>@@ -4653,4 +4653,55 @@
> 	);
> }
> 
>+/**
>+ * @bug 280616: [formatter] Valid 1.5 code is not formatted inside <pre> tag
>+ * @test Ensure that 1.5 snippet is formatted when source level is 1.5
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=280616"
>+ */
>+public void testBug280616() throws JavaModelException {
>+	String source = 
>+		"public interface X {\n" + 
>+		"/**\n" + 
>+		" * <pre>\n" + 
>+		" *   void solve(Executor e,\n" + 
>+		" *              Collection&lt;Callable&lt;Result&gt;&gt; solvers)\n" + 
>+		" *     throws InterruptedException, ExecutionException {\n" + 
>+		" *       CompletionService&lt;Result&gt; ecs\n" + 
>+		" *           = new ExecutorCompletionService&lt;Result&gt;(e);\n" + 
>+		" *       for (Callable&lt;Result&gt; s : solvers)\n" + 
>+		" *           ecs.submit(s);\n" + 
>+		" *       int n = solvers.size();\n" + 
>+		" *       for (int i = 0; i &lt; n; ++i) {\n" + 
>+		" *           Result r = ecs.take().get();\n" + 
>+		" *           if (r != null)\n" + 
>+		" *               use(r);\n" + 
>+		" *       }\n" + 
>+		" *   }\n" + 
>+		" * </pre>\n" + 
>+		" */\n" + 
>+		" void foo();\n" + 
>+		"}\n";
>+	formatSource(source,
>+		"public interface X {\n" + 
>+		"	/**\n" + 
>+		"	 * <pre>\n" + 
>+		"	 * void solve(Executor e, Collection&lt;Callable&lt;Result&gt;&gt; solvers)\n" + 
>+		"	 * 		throws InterruptedException, ExecutionException {\n" + 
>+		"	 * 	CompletionService&lt;Result&gt; ecs = new ExecutorCompletionService&lt;Result&gt;(e);\n" + 
>+		"	 * 	for (Callable&lt;Result&gt; s : solvers)\n" + 
>+		"	 * 		ecs.submit(s);\n" + 
>+		"	 * 	int n = solvers.size();\n" + 
>+		"	 * 	for (int i = 0; i &lt; n; ++i) {\n" + 
>+		"	 * 		Result r = ecs.take().get();\n" + 
>+		"	 * 		if (r != null)\n" + 
>+		"	 * 			use(r);\n" + 
>+		"	 * 	}\n" + 
>+		"	 * }\n" + 
>+		"	 * </pre>\n" + 
>+		"	 */\n" + 
>+		"	void foo();\n" + 
>+		"}\n"
>+	);
>+}
>+
> }

Actions: View | Diff

Attachments on bug 280616: 139436