Attachment 240592 Details for Bug 429738 – Proposed Patch

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

[patch] Proposed Patch

Fix-for-Bug-429749-18search-Enable-the-disabled-308-.patch (text/plain), 5.55 KB, created by Manoj N Palat

on 2014-03-06 08:00:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Manoj N Palat

Created: 2014-03-06 08:00:13 EST

Size: 5.55 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs8Tests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs8Tests.java
>index aead304..a8cac7e 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs8Tests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs8Tests.java
>@@ -76,10 +76,9 @@
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g15"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g16"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g17"));
>-//	suite.addTest(new JavaSearchBugs8Tests("testBug400899g18"));
>-//	suite.addTest(new JavaSearchBugs8Tests("testBug400899g19"));
>+	suite.addTest(new JavaSearchBugs8Tests("testBug400899g18"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g20"));
>-//	suite.addTest(new JavaSearchBugs8Tests("testBug400899g22"));
>+	suite.addTest(new JavaSearchBugs8Tests("testBug400899g22"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g23"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g24"));
> 	suite.addTest(new JavaSearchBugs8Tests("testBug400899g25"));
>@@ -820,7 +819,7 @@
> this.workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/b400899/X.java",
> 		"import java.lang.annotation.ElementType;\n" +
> 		"import java.lang.annotation.Target;\n" +
>-		"public class X<T extends Object & Comparable<? super @Marker String>> {}\n" +
>+		"public class X<T extends @Marker Object & @Marker Comparable<? super @Marker String>> {}\n" +
> 		"class Y<T> {\n" +
> 		"}\n" +
>  		"@Target(ElementType.TYPE_USE)\n" +	
>@@ -837,39 +836,9 @@
> this.resultCollector,
> null);
> assertSearchResults(
>-		"<TODO : ADD THE EXPECTED RESULT HERE>"
>-);	
>-}
>-
>-/**
>- * @bug 400899:  [1.8][search] Search engine/indexer should evolve to support Java 8 constructs
>- * @test Ensures that the search for type use annotation finds matches in the following
>- * ReferenceType3 ::= ReferenceType '>>>'
>- * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=400899"
>- */
>-public void testBug400899g19() throws CoreException {
>-this.workingCopies = new ICompilationUnit[1];
>-this.workingCopies[0] = getWorkingCopy("/JavaSearchBugs/src/b400899/X.java",
>-		"import java.lang.annotation.ElementType;\n" +
>-		"import java.lang.annotation.Target;\n" +
>-		"public class X<A extends X<X<X<@Marker String>>>> {}\n" +
>-		"class Y<T> {\n" +
>-		"}\n" +
>- 		"@Target(ElementType.TYPE_USE)\n" +	
>-		"@interface Marker {}\n"
>-	);
>-SearchPattern pattern = SearchPattern.createPattern(
>-		"Marker",
>-		ANNOTATION_TYPE,
>-		REFERENCES,
>-		EXACT_RULE);
>-new SearchEngine(this.workingCopies).search(pattern,
>-new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
>-getJavaSearchWorkingCopiesScope(),
>-this.resultCollector,
>-null);
>-assertSearchResults(
>-		"<TODO : ADD THE EXPECTED RESULT HERE>"
>+		"src/b400899/X.java b400899.X [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.X [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.X [Marker] EXACT_MATCH"
> );	
> }
> 
>@@ -953,7 +922,11 @@
> this.resultCollector,
> null);
> assertSearchResults(
>-		"TODO - ADD THE RESULT HERE"
>+		"src/b400899/X.java b400899.CI [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.CI [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.CI [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.CJ [Marker] EXACT_MATCH\n" + 
>+		"src/b400899/X.java b400899.CJ [Marker] EXACT_MATCH"
> );	
> }
> 
>diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>index 0e14928..ccc6112 100644
>--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
>@@ -2928,6 +2928,9 @@
> 			if (typeParameter.bounds != null) {
> 				for (int j=0, b=typeParameter.bounds.length; j<b; j++) {
> 					TypeReference typeParameterBound = typeParameter.bounds[j];
>+					if (typeParameterBound.annotations != null) {
>+						reportMatching(typeParameterBound.annotations, enclosingElement, binding,nodeSet, matchedClassContainer);
>+					}
> 					level = (Integer) nodeSet.matchingNodes.removeKey(typeParameterBound);
> 					if (level != null) {
> 						IJavaElement localElement = createHandle(typeParameter, enclosingElement);
>@@ -2939,6 +2942,9 @@
> 	                    	int length = paramSTR.typeArguments.length;
> 	                    	for (int k=0; k<length; k++) {
> 								TypeReference typeArgument = paramSTR.typeArguments[k];
>+								if (typeArgument.annotations != null) {
>+									reportMatching(typeArgument.annotations, enclosingElement, binding,nodeSet, matchedClassContainer);
>+								}
> 								level = (Integer) nodeSet.matchingNodes.removeKey(typeArgument);
> 								if (level != null) {
> 									IJavaElement localElement = createHandle(typeParameter, enclosingElement);
>@@ -2947,6 +2953,9 @@
> 								if (typeArgument instanceof Wildcard) {
> 		                            TypeReference wildcardBound = ((Wildcard) typeArgument).bound;
> 		                            if (wildcardBound != null) {
>+		            					if (wildcardBound.annotations != null) {
>+		            						reportMatching(wildcardBound.annotations, enclosingElement, binding,nodeSet, matchedClassContainer);
>+		            					}
> 										level = (Integer) nodeSet.matchingNodes.removeKey(wildcardBound);
> 										if (level != null) {
> 											IJavaElement localElement = createHandle(typeParameter, enclosingElement);

Actions: View | Diff

Attachments on bug 429738: 240592 | 240596