Attachment 129402 Details for Bug 221018 – Fixes the formatter to handle chaining functions calls

[patch] Fixes the formatter to handle chaining functions calls

patchFor221018 (text/plain), 2.00 KB, created by Chris Jaun

on 2009-03-19 18:22:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Jaun

Created: 2009-03-19 18:22:56 EDT

Size: 2.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.jsdt.core
>Index: src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java,v
>retrieving revision 1.24
>diff -u -r1.24 CodeFormatterVisitor.java
>--- src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java	28 Jan 2009 23:52:47 -0000	1.24
>+++ src/org/eclipse/wst/jsdt/internal/formatter/CodeFormatterVisitor.java	19 Mar 2009 22:22:37 -0000
>@@ -1382,7 +1382,9 @@
> 		do {
> 			try {
> 				this.scribe.alignFragment(cascadingMessageSendAlignment, 0);
>-				this.scribe.printNextToken(TerminalTokens.TokenNameDOT);
>+				//this.scribe.printNextToken(TerminalTokens.TokenNameDOT); Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=221018
>+				// functions can return functions in javascript so there won't always be a dot
>+				this.scribe.printOptionalNextToken(TerminalTokens.TokenNameDOT, false);
> 				for (int i = startingPositionInCascade; i < size; i++) {
> 					MessageSend currentMessageSend = fragments[i];
> 					final int numberOfParens = (currentMessageSend.bits & ASTNode.ParenthesizedMASK) >> ASTNode.ParenthesizedSHIFT;
>@@ -1412,7 +1414,9 @@
> 							}
> 					}
> 					ASTNode[] arguments = currentMessageSend.arguments;
>-					this.scribe.printNextToken(TerminalTokens.TokenNameIdentifier); // selector
>+					// Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=221018
>+					// functions can return functions in javascript so there won't always be another identifier name
>+					this.scribe.printOptionalNextToken(TerminalTokens.TokenNameIdentifier, false); // selector
> 					this.scribe.printNextToken(TerminalTokens.TokenNameLPAREN, this.preferences.insert_space_before_opening_paren_in_method_invocation);
> 					if (arguments != null) {
> 						if (this.preferences.insert_space_after_opening_paren_in_method_invocation) {

Flags:

thatnitind: iplog+

Actions: View | Diff

Attachments on bug 221018: 129402