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

rough handling of typing for ${}

Browse Source
This commit is contained in:
Maxim Mossienko
2005-01-20 22:56:46 +03:00
parent bcdcfe6991
commit c151f3622d
1 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/codeInsight/editorActions/TypedHandler.java
+45 -2
View File
@@ -3,6 +3,7 @@ package com.intellij.codeInsight.editorActions;
import com.intellij.codeInsight.AutoPopupController;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.JspParsingUtil;
import com.intellij.codeInsight.completion.JspxCompletionData;
import com.intellij.codeInsight.highlighting.BraceMatchingUtil;
import com.intellij.openapi.actionSystem.DataConstants;
import com.intellij.openapi.actionSystem.DataContext;
@@ -297,8 +298,7 @@ public class TypedHandler implements TypedActionHandler {
}
if ('>' == charTyped){
if (StdFileTypes.XML == fileType || StdFileTypes.HTML == fileType || StdFileTypes.XHTML == fileType ||
StdFileTypes.JSPX == fileType){
if (file instanceof XmlFile){
handleXmlGreater(project, editor, fileType);
} else if (originalFileType == StdFileTypes.JSP) {
handleJspGreater(project, editor);
@@ -315,6 +315,8 @@ public class TypedHandler implements TypedActionHandler {
}
else if ('"' == charTyped || '\'' == charTyped){
if (handleQuote(editor, fileType, charTyped, dataContext)) return;
} else if ('}' == charTyped && originalFileType == StdFileTypes.JSPX) {
if (handleELClosingBrace(editor, file,project)) return;
}
myOriginalHandler.execute(editor, charTyped, dataContext);
@@ -329,6 +331,9 @@ public class TypedHandler implements TypedActionHandler {
indentClosingBrace(project, editor);
}
else if ('{' == charTyped){
if (originalFileType == StdFileTypes.JSPX) {
if(handleELOpeningBrace(editor, file,project)) return;
}
indentOpenedBrace(project, editor);
}
else if ('/' == charTyped){
@@ -344,6 +349,44 @@ public class TypedHandler implements TypedActionHandler {
}
}
private boolean handleELOpeningBrace(final Editor editor, final PsiFile file, final Project project) {
PsiDocumentManager.getInstance(project).commitAllDocuments();
final int offset = editor.getCaretModel().getOffset();
final PsiElement elementAt = file.findElementAt(offset-1);
// TODO: handle it with insertAfterLParen(...)
if (!JspxCompletionData.isJavaContext(elementAt) &&
elementAt.getText().equals("${")
) {
editor.getDocument().insertString(offset, "}");
return true;
}
return false;
}
private boolean handleELClosingBrace(final Editor editor, final PsiFile file, final Project project) {
PsiDocumentManager.getInstance(project).commitAllDocuments();
final int offset = editor.getCaretModel().getOffset();
PsiElement elementAt = file.findElementAt(offset-1);
// TODO: handle it with insertAfterRParen(...)
if (!JspxCompletionData.isJavaContext(elementAt)) {
while(!elementAt.getText().startsWith("${")) {
elementAt = elementAt.getPrevSibling();
if (elementAt==null) break;
}
if (elementAt!=null) {
editor.getCaretModel().moveToOffset(offset + 1);
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
return true;
}
}
return false;
}
private void handleJspEqual(Project project, Editor editor) {
final CharSequence chars = editor.getDocument().getCharsSequence();
int current = editor.getCaretModel().getOffset();