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

Checking for highlighted parameter in test.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-12-24 22:29:23 +04:00
parent ee62d318ee
commit 56d7f2a2d5
15 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
+1 -1
View File
@@ -10,5 +10,5 @@ class B(): A(5) {
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
+2 -2
View File
@@ -10,6 +10,6 @@ class B(): A(5) {
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: Int, y: Boolean, z: String), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
Text: (x: Int, <highlight>y: Boolean</highlight>, z: String), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: Boolean = true], [x: Int], [z: Long = 12345678901234], [u: String = "abc\n"], [u0: String = "" + "123"], [uu: String = "$u"], [v: Char = '\u0000'], [vv: String = "..."]), Disabled: false, Strikeout: false, Green: true
Text: (<highlight>[x: Int]</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>[y: Boolean = true]</highlight>, [x: Int], [z: Long = 12345678901234], [u: String = "abc\n"], [u0: String = "" + "123"], [uu: String = "$u"], [v: Char = '\u0000'], [vv: String = "..."]), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
+1 -1
View File
@@ -8,5 +8,5 @@ open class A(x: Int) {
}
/*
Text: ([x: Int]), Disabled: true, Strikeout: false, Green: false
Text: ([x: Int], [y: Boolean]), Disabled: false, Strikeout: false, Green: true
Text: ([x: Int], <highlight>[y: Boolean]</highlight>), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: Boolean], [x: Int]), Disabled: false, Strikeout: false, Green: true
Text: (<highlight>[x: Int]</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>[y: Boolean]</highlight>, [x: Int]), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
+2 -2
View File
@@ -14,6 +14,6 @@ fun f() {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Int), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Int</highlight>, y: Int), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/Println.kt
+3 -3
View File
@@ -8,7 +8,7 @@ open class A(x: Int) {
}
}
/*
Text: (<no parameters>), Disabled: false, Strikeout: false, Green: true
Text: (x: Boolean), Disabled: false, Strikeout: false, Green: false
Text: (x: String), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Boolean</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: String</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<no parameters>), Disabled: true, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/Simple.kt
+1 -1
View File
@@ -5,4 +5,4 @@ open class A(x: Int) {
m(<caret>1, false)
}
}
//Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
//Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
+1 -1
View File
@@ -6,4 +6,4 @@ class B(): A(5) {
A(<caret>3)
}
}
//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
//Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
+1 -1
View File
@@ -6,4 +6,4 @@ class B(): A(<caret>5) {
A(3)
}
}
//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
//Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (<highlight>x: Int</highlight>), Disabled: false, Strikeout: false, Green: false
Text: (<highlight>x: Int</highlight>, y: Boolean), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
+1 -1
View File
@@ -8,5 +8,5 @@ open class A(x: Int) {
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: Int, <highlight>y: Boolean</highlight>), Disabled: false, Strikeout: false, Green: true
*/
idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
+4 -1
View File
@@ -106,7 +106,10 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas
MockUpdateParameterInfoContext updateContext = new MockUpdateParameterInfoContext(file, myFixture);
//to update current parameter index
parameterInfoHandler.findElementForUpdatingParameterInfo(updateContext);
JetValueArgumentList elementForUpdating = parameterInfoHandler.findElementForUpdatingParameterInfo(updateContext);
if (elementForUpdating != null) {
parameterInfoHandler.updateParameterInfo(elementForUpdating, updateContext);
}
MockParameterInfoUIContext parameterInfoUIContext =
new MockParameterInfoUIContext(parameterOwner, updateContext.getCurrentParameter());
idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
+13 -1
View File
@@ -39,7 +39,19 @@ public class MockParameterInfoUIContext implements ParameterInfoUIContext {
public String setupUIComponentPresentation(String text, int highlightStartOffset, int highlightEndOffset,
boolean isDisabled, boolean strikeout,
boolean isDisabledBeforeHighlight, Color background) {
String resultText = "Text: (" + text + "), " +
String highlightedText;
if (highlightStartOffset != -1 && highlightEndOffset != -1) {
highlightedText = text.substring(0, highlightStartOffset)
+ "<highlight>"
+ text.substring(highlightStartOffset, highlightEndOffset)
+ "</highlight>"
+ text.substring(highlightEndOffset);
}
else {
highlightedText = text;
}
String resultText = "Text: (" + highlightedText + "), " +
"Disabled: " + isDisabled + ", " +
"Strikeout: " + strikeout + ", " +
"Green: " + background.equals(JetFunctionParameterInfoHandler.GREEN_BACKGROUND);