azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring in InTextDirectivesUtils

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2012-10-05 11:47:40 +04:00
parent a5b43cbbae
commit 727414ba22
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class JetConfidenceTest extends LightCompletionTestCase {
protected static String getTypeTextFromFile() { protected static String getTypeTextFromFile() {
String text = getEditor().getDocument().getText(); String text = getEditor().getDocument().getText();
String[] directives = InTextDirectivesUtils.findListWithPrefix(TYPE_DIRECTIVE_PREFIX, text); String[] directives = InTextDirectivesUtils.findArrayWithPrefix(TYPE_DIRECTIVE_PREFIX, text);
assertEquals("One directive with \"" + TYPE_DIRECTIVE_PREFIX +"\" expected", 1, directives.length); assertEquals("One directive with \"" + TYPE_DIRECTIVE_PREFIX +"\" expected", 1, directives.length);
return StringUtil.unquoteString(directives[0]); return StringUtil.unquoteString(directives[0]);
idea/tests/org/jetbrains/jet/formatter/FormattingSettingsConfigurator.java
+2 -2
View File
@@ -33,8 +33,8 @@ public class FormattingSettingsConfigurator {
private final String[] settingsToFalse; private final String[] settingsToFalse;
public FormattingSettingsConfigurator(String fileText) { public FormattingSettingsConfigurator(String fileText) {
settingsToTrue = InTextDirectivesUtils.findListWithPrefix("// SET_TRUE:", fileText); settingsToTrue = InTextDirectivesUtils.findArrayWithPrefix("// SET_TRUE:", fileText);
settingsToFalse = InTextDirectivesUtils.findListWithPrefix("// SET_FALSE:", fileText); settingsToFalse = InTextDirectivesUtils.findArrayWithPrefix("// SET_FALSE:", fileText);
} }
public void configureSettings(CodeStyleSettings settings) { public void configureSettings(CodeStyleSettings settings) {
idea/tests/org/jetbrains/jet/plugin/navigation/ImplementationTestUtils.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class ImplementationTestUtils {
public static void assertGotoImplementations(Editor editor, GotoTargetHandler.GotoData gotoData) { public static void assertGotoImplementations(Editor editor, GotoTargetHandler.GotoData gotoData) {
// Get expected references from the tested document // Get expected references from the tested document
List<String> expectedReferences = Arrays.asList(InTextDirectivesUtils.findListWithPrefix("// REF:", editor.getDocument().getText())); List<String> expectedReferences = InTextDirectivesUtils.findListWithPrefix("// REF:", editor.getDocument().getText());
Collections.sort(expectedReferences); Collections.sort(expectedReferences);
if (gotoData != null) { if (gotoData != null) {
idea/tests/org/jetbrains/jet/testing/InTextDirectivesUtils.java
+8 -3
View File
@@ -37,7 +37,7 @@ public final class InTextDirectivesUtils {
@Nullable @Nullable
public static Integer getPrefixedInt(String fileText, String prefix) { public static Integer getPrefixedInt(String fileText, String prefix) {
final String[] numberStrings = findListWithPrefix(prefix, fileText); final String[] numberStrings = findArrayWithPrefix(prefix, fileText);
if (numberStrings.length > 0) { if (numberStrings.length > 0) {
return Integer.parseInt(numberStrings[0]); return Integer.parseInt(numberStrings[0]);
} }
@@ -46,7 +46,12 @@ public final class InTextDirectivesUtils {
} }
@NotNull @NotNull
public static String[] findListWithPrefix(String prefix, String fileText) { public static String[] findArrayWithPrefix(String prefix, String fileText) {
return ArrayUtil.toStringArray(findListWithPrefix(prefix, fileText));
}
@NotNull
public static List<String> findListWithPrefix(String prefix, String fileText) {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
for (String line : findLinesWithPrefixRemoved(prefix, fileText)) { for (String line : findLinesWithPrefixRemoved(prefix, fileText)) {
@@ -57,7 +62,7 @@ public final class InTextDirectivesUtils {
} }
} }
return ArrayUtil.toStringArray(result); return result;
} }
@NotNull @NotNull