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

Minor: small code rearrangement

Browse Source
This commit is contained in:
Nikolay Krasko
2014-08-26 14:16:39 +04:00
parent 10886a8ce3
commit 932bd57cf9
4 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
+1 -1
View File
@@ -52,7 +52,7 @@ public abstract class JetFixtureCompletionBaseTestCase extends JetLightCodeInsig
oldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION;
settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = value;
}
else{
else {
oldValue = settings.AUTOCOMPLETE_COMMON_PREFIX;
settings.AUTOCOMPLETE_ON_CODE_COMPLETION = value;
}
idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java
+10 -5
View File
@@ -259,20 +259,25 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
private JetChangeInfo getChangeInfo() throws Exception {
configureByFile(getTestName(false) + "Before.kt");
Editor editor = getEditor();
PsiFile file = getFile();
Project project = getProject();
JetElement element = (JetElement) new JetChangeSignatureHandler().findTargetMember(file, editor);
assertNotNull("Target element is null", element);
Project project = getProject();
BindingContext bindingContext =
AnalyzerFacadeWithCache.getContextForElement(element);
BindingContext bindingContext = AnalyzerFacadeWithCache.getContextForElement(element);
PsiElement context = file.findElementAt(editor.getCaretModel().getOffset());
assertNotNull(context);
FunctionDescriptor functionDescriptor = JetChangeSignatureHandler.findDescriptor(element, project, editor, bindingContext);
assertNotNull(functionDescriptor);
JetChangeSignatureDialog dialog = getChangeSignatureDialog(project, functionDescriptor,
JetChangeSignatureHandler.getConfiguration(), bindingContext, context);
JetChangeSignatureDialog dialog = getChangeSignatureDialog(
project, functionDescriptor, JetChangeSignatureHandler.getConfiguration(), bindingContext, context);
assertNotNull(dialog);
dialog.canRun();
Disposer.register(getTestRootDisposable(), dialog.getDisposable());
return dialog.evaluateChangeInfo();