Attachment 142634 Details for Bug 276526 – Code plugin patch - v-0.7

[patch] Code plugin patch - v-0.7

276526-code-patch-v0.7.txt (text/plain), 2.77 KB, created by Pradeep Balachandran

on 2009-07-27 06:26:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pradeep Balachandran

Created: 2009-07-27 06:26:37 EDT

Size: 2.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java,v
>retrieving revision 1.401
>diff -u -r1.401 CompletionEngine.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	23 Jul 2009 05:08:58 -0000	1.401
>+++ codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java	27 Jul 2009 10:04:39 -0000
>@@ -1162,6 +1162,10 @@
> 					break;
> 			}
> 		}
>+		
>+		if (isForbiddenType(packageName, simpleTypeName, enclosingTypeNames)) {
>+			return;
>+		}
> 
> 		if(this.acceptedTypes == null) {
> 			this.acceptedTypes = new ObjectVector();
>@@ -3791,13 +3795,22 @@
> 			}
> 			TypeReference[] superInterfaces = typeDeclaration.superInterfaces;
> 			int length = superInterfaces == null ? 0 : superInterfaces.length;
>+			int astNodeIndex = -1;
> 			for (int i = 0; i < length; i++) {
> 				if(superInterfaces[i] == astNode) {
> 					addForbiddenBindings(typeDeclaration.binding);
> 					addForbiddenBindingsForMemberTypes(typeDeclaration);
>-					return scope.parent;
>+					astNodeIndex = i;
>+					break;
> 				}
> 			}
>+			if (astNodeIndex >= 0) {
>+				// Need to loop only up to astNodeIndex as the rest will be undefined.
>+				for (int i = 0; i < astNodeIndex; i++) {
>+					addForbiddenBindings(superInterfaces[i].resolvedType);
>+				}
>+				return scope.parent;
>+			}
> 		} else {
> 			if (astNodeParent != null && astNodeParent instanceof TryStatement) {
> 				boolean isException = false;
>@@ -11701,6 +11714,28 @@
> 		return false;
> 	}
> 
>+	private boolean isForbiddenType(char[] givenPkgName, char[] givenTypeName, char[][] enclosingTypeNames) {
>+		// CharOperation.concatWith() handles the cases where input args are null/empty
>+		char[] fullTypeName = CharOperation.concatWith(enclosingTypeNames, givenTypeName, '.');
>+		for (int i = 0; i <= this.forbbidenBindingsPtr; i++) {
>+			if (this.forbbidenBindings[i] instanceof TypeBinding) {
>+				TypeBinding typeBinding = (TypeBinding) this.forbbidenBindings[i];
>+				char[] currPkgName = typeBinding.qualifiedPackageName();
>+				if (CharOperation.equals(givenPkgName, currPkgName))	{
>+					char[] currTypeName = typeBinding.qualifiedSourceName();
>+					int genericTypePos = CharOperation.indexOf('<', currTypeName);
>+					if (genericTypePos >= 0) {
>+						currTypeName = CharOperation.subarray(currTypeName, 0, genericTypePos);
>+					}
>+					if (CharOperation.equals(fullTypeName, currTypeName)) {
>+						return true;
>+					}
>+				}
>+			}
>+		}
>+		return false;
>+	}
>+
> 	private boolean isIgnored(int kind) {
> 		return this.requestor.isIgnored(kind);
> 	}

Actions: View | Diff

Attachments on bug 276526: 138136 | 138137 | 138631 | 142634 | 142636 | 142862