Attachment #76257 for bug #109695




		"interface IDocumentExtension315 {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("IDE3", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("IDE3", validatedRule, requestor);
	assertSearchResults(
		"IDocumentExtension135\n" + 
		"IDocumentExtension3\n" + 

		"interface IDocumentProviderExtension54321 {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("IDPE3", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("IDPE3", validatedRule, requestor);
	assertSearchResults(
		"IDocumentProviderExtension12345\n" + 
		"IDocumentProviderExtension3\n" + 

		"interface IPerspectiveListener3 {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("IPL3", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("IPL3", validatedRule, requestor);
	assertSearchResults(
		"IPerspectiveListener3",
		requestor

		"interface IPropertySource2 {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("IPS2", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("IPS2", validatedRule, requestor);
	assertSearchResults(
		"IPropertySource2",
		requestor

		"interface IWorkbenchWindowPulldownDelegate4 {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("IWWPD2", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("IWWPD2", validatedRule, requestor);
	assertSearchResults(
		"IWorkbenchWindowPulldownDelegate2",
		requestor

		"class UTFDocScannerSupport {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("UTF16DSS", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("UTF16DSS", validatedRule, requestor);
	assertSearchResults(
		"UTF16DocumentScannerSupport",
		requestor

		"class UTFDocScannerSupport {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("UTF1DSS", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("UTF1DSS", validatedRule, requestor);
	assertSearchResults(
		"UTF16DocumentScannerSupport\n" + 
		"UTF1DocScannerSupport",

		"class UTFDocScannerSupport {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("UTF6DSS", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("UTF6DSS", validatedRule, requestor);
	assertSearchResults(
		"UTF16DocumentScannerSupport\n" + 
		"UTF6DocScannerSupport",

		"class UTFDocScannerSupport {}\n"
	);
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	int validatedRule = SearchPattern.validateMatchRule("UTFDSS", SearchPattern.R_CAMELCASE_MATCH);
	searchAllTypeNames("UTFDSS", validatedRule, requestor);
	assertSearchResults(
		"UTF16DocumentScannerSupport\n" + 
		"UTF1DocScannerSupport\n" + 

	);
}

public void testONLY_Bug110060_MethodPattern08() throws CoreException {
	setUpBug110060_MethodPattern();
	search("aMW1D", METHOD, ALL_OCCURRENCES, SearchPattern.R_CAMELCASE_MATCH);
	assertSearchResults(
		"src/b110060/Test.java void b110060.Test.aMethodWith1Digit() [aMethodWith1Digit] EXACT_MATCH\n" + 
		"src/b110060/Test.java void b110060.Test.aMethodWith1DigitAnd_AnUnderscore() [aMethodWith1DigitAnd_AnUnderscore] EXACT_MATCH\n" + 
		"src/b110060/Test.java void b110060.Test.testReferences() [aMethodWith1Digit()] EXACT_MATCH\n" + 
		"src/b110060/Test.java void b110060.Test.testReferences() [aMethodWith1DigitAnd_AnUnderscore()] EXACT_MATCH"
	);
}

public void testBug110060_MethodPattern09() throws CoreException {

Lines 1706-1712 Link Here

(-)search/org/eclipse/jdt/core/search/SearchPattern.java (-1 / +1 lines)
1706	boolean uppercase = false;	1706	boolean uppercase = false;
1707	for (int i=0; i<length && validCamelCase; i++) {	1707	for (int i=0; i<length && validCamelCase; i++) {
1708	char ch = stringPattern.charAt(i);	1708	char ch = stringPattern.charAt(i);
1709	validCamelCase = ScannerHelper.isJavaIdentifierStart(ch);	1709	validCamelCase = i==0 ? ScannerHelper.isJavaIdentifierStart(ch) : ScannerHelper.isJavaIdentifierPart(ch);
1710	// at least one uppercase character is need in CamelCase pattern	1710	// at least one uppercase character is need in CamelCase pattern
1711	// (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=136313)	1711	// (see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=136313)
1712	if (!uppercase) uppercase = ScannerHelper.isUpperCase(ch);	1712	if (!uppercase) uppercase = ScannerHelper.isUpperCase(ch);

Return to bug 109695

Lines 4731-4737 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (-11 / +25 lines)
4731	"interface IDocumentExtension315 {}\n"	4731	"interface IDocumentExtension315 {}\n"
4732	);	4732	);
4733	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4733	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4734	searchAllTypeNames("IDE3", SearchPattern.R_CAMELCASE_MATCH, requestor);	4734	int validatedRule = SearchPattern.validateMatchRule("IDE3", SearchPattern.R_CAMELCASE_MATCH);
		4735	searchAllTypeNames("IDE3", validatedRule, requestor);
4735	assertSearchResults(	4736	assertSearchResults(
4736	"IDocumentExtension135\n" +	4737	"IDocumentExtension135\n" +
4737	"IDocumentExtension3\n" +	4738	"IDocumentExtension3\n" +
Lines 4751-4757 Link Here
4751	"interface IDocumentProviderExtension54321 {}\n"	4752	"interface IDocumentProviderExtension54321 {}\n"
4752	);	4753	);
4753	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4754	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4754	searchAllTypeNames("IDPE3", SearchPattern.R_CAMELCASE_MATCH, requestor);	4755	int validatedRule = SearchPattern.validateMatchRule("IDPE3", SearchPattern.R_CAMELCASE_MATCH);
		4756	searchAllTypeNames("IDPE3", validatedRule, requestor);
4755	assertSearchResults(	4757	assertSearchResults(
4756	"IDocumentProviderExtension12345\n" +	4758	"IDocumentProviderExtension12345\n" +
4757	"IDocumentProviderExtension3\n" +	4759	"IDocumentProviderExtension3\n" +
Lines 4767-4773 Link Here
4767	"interface IPerspectiveListener3 {}\n"	4769	"interface IPerspectiveListener3 {}\n"
4768	);	4770	);
4769	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4771	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4770	searchAllTypeNames("IPL3", SearchPattern.R_CAMELCASE_MATCH, requestor);	4772	int validatedRule = SearchPattern.validateMatchRule("IPL3", SearchPattern.R_CAMELCASE_MATCH);
		4773	searchAllTypeNames("IPL3", validatedRule, requestor);
4771	assertSearchResults(	4774	assertSearchResults(
4772	"IPerspectiveListener3",	4775	"IPerspectiveListener3",
4773	requestor	4776	requestor
Lines 4780-4786 Link Here
4780	"interface IPropertySource2 {}\n"	4783	"interface IPropertySource2 {}\n"
4781	);	4784	);
4782	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4785	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4783	searchAllTypeNames("IPS2", SearchPattern.R_CAMELCASE_MATCH, requestor);	4786	int validatedRule = SearchPattern.validateMatchRule("IPS2", SearchPattern.R_CAMELCASE_MATCH);
		4787	searchAllTypeNames("IPS2", validatedRule, requestor);
4784	assertSearchResults(	4788	assertSearchResults(
4785	"IPropertySource2",	4789	"IPropertySource2",
4786	requestor	4790	requestor
Lines 4796-4802 Link Here
4796	"interface IWorkbenchWindowPulldownDelegate4 {}\n"	4800	"interface IWorkbenchWindowPulldownDelegate4 {}\n"
4797	);	4801	);
4798	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4802	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4799	searchAllTypeNames("IWWPD2", SearchPattern.R_CAMELCASE_MATCH, requestor);	4803	int validatedRule = SearchPattern.validateMatchRule("IWWPD2", SearchPattern.R_CAMELCASE_MATCH);
		4804	searchAllTypeNames("IWWPD2", validatedRule, requestor);
4800	assertSearchResults(	4805	assertSearchResults(
4801	"IWorkbenchWindowPulldownDelegate2",	4806	"IWorkbenchWindowPulldownDelegate2",
4802	requestor	4807	requestor
Lines 4811-4817 Link Here
4811	"class UTFDocScannerSupport {}\n"	4816	"class UTFDocScannerSupport {}\n"
4812	);	4817	);
4813	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4818	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4814	searchAllTypeNames("UTF16DSS", SearchPattern.R_CAMELCASE_MATCH, requestor);	4819	int validatedRule = SearchPattern.validateMatchRule("UTF16DSS", SearchPattern.R_CAMELCASE_MATCH);
		4820	searchAllTypeNames("UTF16DSS", validatedRule, requestor);
4815	assertSearchResults(	4821	assertSearchResults(
4816	"UTF16DocumentScannerSupport",	4822	"UTF16DocumentScannerSupport",
4817	requestor	4823	requestor
Lines 4826-4832 Link Here
4826	"class UTFDocScannerSupport {}\n"	4832	"class UTFDocScannerSupport {}\n"
4827	);	4833	);
4828	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4834	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4829	searchAllTypeNames("UTF1DSS", SearchPattern.R_CAMELCASE_MATCH, requestor);	4835	int validatedRule = SearchPattern.validateMatchRule("UTF1DSS", SearchPattern.R_CAMELCASE_MATCH);
		4836	searchAllTypeNames("UTF1DSS", validatedRule, requestor);
4830	assertSearchResults(	4837	assertSearchResults(
4831	"UTF16DocumentScannerSupport\n" +	4838	"UTF16DocumentScannerSupport\n" +
4832	"UTF1DocScannerSupport",	4839	"UTF1DocScannerSupport",
Lines 4842-4848 Link Here
4842	"class UTFDocScannerSupport {}\n"	4849	"class UTFDocScannerSupport {}\n"
4843	);	4850	);
4844	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4851	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4845	searchAllTypeNames("UTF6DSS", SearchPattern.R_CAMELCASE_MATCH, requestor);	4852	int validatedRule = SearchPattern.validateMatchRule("UTF6DSS", SearchPattern.R_CAMELCASE_MATCH);
		4853	searchAllTypeNames("UTF6DSS", validatedRule, requestor);
4846	assertSearchResults(	4854	assertSearchResults(
4847	"UTF16DocumentScannerSupport\n" +	4855	"UTF16DocumentScannerSupport\n" +
4848	"UTF6DocScannerSupport",	4856	"UTF6DocScannerSupport",
Lines 4858-4864 Link Here
4858	"class UTFDocScannerSupport {}\n"	4866	"class UTFDocScannerSupport {}\n"
4859	);	4867	);
4860	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();	4868	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
4861	searchAllTypeNames("UTFDSS", SearchPattern.R_CAMELCASE_MATCH, requestor);	4869	int validatedRule = SearchPattern.validateMatchRule("UTFDSS", SearchPattern.R_CAMELCASE_MATCH);
		4870	searchAllTypeNames("UTFDSS", validatedRule, requestor);
4862	assertSearchResults(	4871	assertSearchResults(
4863	"UTF16DocumentScannerSupport\n" +	4872	"UTF16DocumentScannerSupport\n" +
4864	"UTF1DocScannerSupport\n" +	4873	"UTF1DocScannerSupport\n" +
Lines 5541-5550 Link Here
5541	);	5550	);
5542	}	5551	}
5543		5552
5544	public void testBug110060_MethodPattern08() throws CoreException {	5553	public void testONLY_Bug110060_MethodPattern08() throws CoreException {
5545	setUpBug110060_MethodPattern();	5554	setUpBug110060_MethodPattern();
5546	search("aMW1D", METHOD, ALL_OCCURRENCES, SearchPattern.R_CAMELCASE_MATCH);	5555	search("aMW1D", METHOD, ALL_OCCURRENCES, SearchPattern.R_CAMELCASE_MATCH);
5547	assertSearchResults("");	5556	assertSearchResults(
		5557	"src/b110060/Test.java void b110060.Test.aMethodWith1Digit() [aMethodWith1Digit] EXACT_MATCH\n" +
		5558	"src/b110060/Test.java void b110060.Test.aMethodWith1DigitAnd_AnUnderscore() [aMethodWith1DigitAnd_AnUnderscore] EXACT_MATCH\n" +
		5559	"src/b110060/Test.java void b110060.Test.testReferences() [aMethodWith1Digit()] EXACT_MATCH\n" +
		5560	"src/b110060/Test.java void b110060.Test.testReferences() [aMethodWith1DigitAnd_AnUnderscore()] EXACT_MATCH"
		5561	);
5548	}	5562	}
5549		5563
5550	public void testBug110060_MethodPattern09() throws CoreException {	5564	public void testBug110060_MethodPattern09() throws CoreException {