Attachment 22248 Details for Bug 82560 – Proposed patch

Proposed patch

patchjdtcore001.txt (text/plain), 3.01 KB, created by David Audel

on 2005-06-02 13:09:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Audel

Created: 2005-06-02 13:09:31 EDT

Size: 3.01 KB

patch

obsolete

>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java,v
>retrieving revision 1.22
>diff -u -r1.22 CompletionOnMessageSend.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java	23 Feb 2005 02:47:28 -0000	1.22
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java	2 Jun 2005 16:57:35 -0000
>@@ -60,6 +60,16 @@
> 
> 		output.append("<CompleteOnMessageSend:"); //$NON-NLS-1$
> 		if (!receiver.isImplicitThis()) receiver.printExpression(0, output).append('.'); //$NON-NLS-1$
>+		if (this.typeArguments != null) {
>+			output.append('<');//$NON-NLS-1$
>+			int max = typeArguments.length - 1;
>+			for (int j = 0; j < max; j++) {
>+				typeArguments[j].print(0, output);
>+				output.append(", ");//$NON-NLS-1$
>+			}
>+			typeArguments[max].print(0, output);
>+			output.append('>');
>+		}
> 		output.append(selector).append('('); //$NON-NLS-1$
> 		if (arguments != null) {
> 			for (int i = 0; i < arguments.length; i++) {
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java,v
>retrieving revision 1.136
>diff -u -r1.136 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	2 Jun 2005 12:50:26 -0000	1.136
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	2 Jun 2005 16:57:37 -0000
>@@ -551,7 +551,12 @@
> 								
> 								// remove selector 
> 								this.identifierPtr--; 
>-								this.identifierLengthStack[this.identifierLengthPtr]--;
>+								if(this.genericsPtr > -1 && this.genericsLengthPtr > -1 && this.genericsLengthStack[this.genericsLengthPtr] > 0) {
>+									// is inside a paremeterized method: bar.<X>.foo
>+									this.identifierLengthPtr--;
>+								} else {
>+									this.identifierLengthStack[this.identifierLengthPtr]--;
>+								}
> 								// consume the receiver
> 								int identifierLength = this.identifierLengthStack[this.identifierLengthPtr];
> 								if(this.identifierPtr > -1 && identifierLength > 0 && this.identifierPtr + 1 >= identifierLength) {
>@@ -1163,7 +1168,12 @@
> 				
> 					// remove selector 
> 					this.identifierPtr--; 
>-					this.identifierLengthStack[this.identifierLengthPtr]--;
>+					if(this.genericsPtr > -1 && this.genericsLengthPtr > -1 && this.genericsLengthStack[this.genericsLengthPtr] > 0) {
>+						// is inside a paremeterized method: bar.<X>.foo
>+						this.identifierLengthPtr--;
>+					} else {
>+						this.identifierLengthStack[this.identifierLengthPtr]--;
>+					}
> 					// consume the receiver
> 					messageSend.receiver = this.getUnspecifiedReference();
> 					break;

Actions: View

Attachments on bug 82560: 22248