MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Don't warn that "iOS" is not capitalized: it shouldn't: IDEA-226591

Browse Source 
GitOrigin-RevId: 6bae9cc8e16d9038cae815f9ad3231ac4bfb1ee5
This commit is contained in:
Kirill Likhodedov
2019-11-10 18:38:03 +03:00
committed by intellij-monorepo-bot
parent bcb954642f
commit 4c71808b61
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/NlsCapitalizationUtilTest.java
View File

@@ -59,6 +59,11 @@ public class NlsCapitalizationUtilTest extends TestCase {
public void testSentenceTooManyUppercaseWords() {
assertNotCapitalization("Four Upper Case Words two lowercase", Nls.Capitalization.Sentence);
}
public void testiOSDoesntNeedCapitalization() {
assertTitle("iOS");
}
public void testTitle() {
assertTitle("Word");
assertTitle("Word Two");

8
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
View File

@@ -469,7 +469,7 @@ public class StringUtil extends StringUtilRt {
@NotNull
@Contract(pure = true)
public static String wordsToBeginFromUpperCase(@NotNull String s) {
return fixCapitalization(s, ourPrepositions, true);
return fixCapitalization(s, ArrayUtil.mergeArrays(ourPrepositions, ourOtherNonCapitalizableWords), true);
}
@NotNull
@@ -521,6 +521,10 @@ public class StringUtil extends StringUtilRt {
"per", "nor", "the", "to", "up", "upon", "via", "with"
};
private static final String[] ourOtherNonCapitalizableWords = {
"iOS", "iPhone", "iPad", "iMac"
};
/**
* @deprecated Use {@link #isPreposition(String, int, int, String[])}.
*/
@@ -538,7 +542,7 @@ public class StringUtil extends StringUtilRt {
if (lastChar - firstChar + 1 == preposition.length()) {
found = true;
for (int j = 0; j < preposition.length(); j++) {
if (toLowerCase(s.charAt(firstChar + j)) != preposition.charAt(j)) {
if (toLowerCase(s.charAt(firstChar + j)) != toLowerCase(preposition.charAt(j))) {
found = false;
break;
}