mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Bug 318726: Weird name for methods when using generates getter and setters on variable "ID"

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=318726
This commit is contained in:
Emanuel Graf 2010-07-06 11:19:16 +00:00
parent 4a4b444602
commit d03905c62d
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameHelperTest.java
View file

@ -38,6 +38,8 @@ public class NameHelperTest extends TestCase {
assertEquals("O__b", NameHelper.trimFieldName("fO__b")); assertEquals("O__b", NameHelper.trimFieldName("fO__b"));
assertEquals("Oo", NameHelper.trimFieldName("fOo")); assertEquals("Oo", NameHelper.trimFieldName("fOo"));
assertEquals("O", NameHelper.trimFieldName("fO")); assertEquals("O", NameHelper.trimFieldName("fO"));
assertEquals("MyStatic", NameHelper.trimFieldName("sMyStatic"));
assertEquals("MyMember", NameHelper.trimFieldName("mMyMember"));
assertEquals("8", NameHelper.trimFieldName("_8")); assertEquals("8", NameHelper.trimFieldName("_8"));
@ -45,6 +47,12 @@ public class NameHelperTest extends TestCase {
assertEquals("8bar_8", NameHelper.trimFieldName("_8bar_8")); assertEquals("8bar_8", NameHelper.trimFieldName("_8bar_8"));
assertEquals("8bAr", NameHelper.trimFieldName("_8bAr")); assertEquals("8bAr", NameHelper.trimFieldName("_8bAr"));
assertEquals("b8Ar", NameHelper.trimFieldName("_b8Ar")); assertEquals("b8Ar", NameHelper.trimFieldName("_b8Ar"));
assertEquals("Id", NameHelper.trimFieldName("Id"));
assertEquals("ID", NameHelper.trimFieldName("ID"));
assertEquals("IDS", NameHelper.trimFieldName("IDS"));
assertEquals("ID", NameHelper.trimFieldName("bID"));
assertEquals("IdA", NameHelper.trimFieldName("IdA"));
} }
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java
View file

@ -114,7 +114,12 @@ public class NameHelper {
} }
lookAhead++; lookAhead++;
} }
} else if (start + 1 <= end && Character.isUpperCase(letters[start + 1])) {
}
// Sometimes, a one letter lower case prefix is used to add some info
// Example: mMyMember, sMyStatic
// Trim the first letter
else if (!Character.isUpperCase(letters[start]) && start + 1 <= end && Character.isUpperCase(letters[start + 1])) {
start++; start++;
} }