MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

let Complete Statement action first finish the live template if any (IDEA-128090)

Browse Source
This commit is contained in:
peter
2014-09-12 18:22:08 +02:00
parent f43c25a087
commit fe29651ad4
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java
+7
View File
@@ -18,6 +18,8 @@ package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.lang.Language;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
@@ -64,6 +66,11 @@ public class SmartEnterAction extends EditorAction {
LookupManager.getInstance(project).hideActiveLookup();
TemplateState state = TemplateManagerImpl.getTemplateState(editor);
if (state != null) {
state.gotoEnd();
}
final int caretOffset = editor.getCaretModel().getOffset();
PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(editor, project);