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

context languages: when selected - move through selection to get non white space

Browse Source
This commit is contained in:
anna
2011-03-11 16:53:03 +01:00
parent 9cd8517fb7
commit bacfc555ec
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java
+19 -8
View File
@@ -117,18 +117,29 @@ public class TextEditorPsiDataProvider implements EditorDataProvider {
}
private static Language getLanguageAtCurrentPositionInEditor(final Editor editor, final PsiFile psiFile) {
int mostProbablyCorrectLanguageOffset = getOffset(editor);
final SelectionModel selectionModel = editor.getSelectionModel();
int caretOffset = editor.getCaretModel().getOffset();
int mostProbablyCorrectLanguageOffset = caretOffset == selectionModel.getSelectionStart() ||
caretOffset == selectionModel.getSelectionEnd()
? selectionModel.getSelectionStart()
: caretOffset;
if (selectionModel.hasSelection()) {
return getLanguageAtOffset(psiFile, mostProbablyCorrectLanguageOffset, selectionModel.getSelectionEnd());
}
return PsiUtilBase.getLanguageAtOffset(psiFile, mostProbablyCorrectLanguageOffset);
}
private static int getOffset(Editor editor) {
final SelectionModel selectionModel = editor.getSelectionModel();
int caretOffset = editor.getCaretModel().getOffset();
return caretOffset == selectionModel.getSelectionStart() ||
caretOffset == selectionModel.getSelectionEnd()
? selectionModel.getSelectionStart()
: caretOffset;
private static Language getLanguageAtOffset(PsiFile psiFile, int mostProbablyCorrectLanguageOffset, int end) {
final PsiElement elt = psiFile.findElementAt(mostProbablyCorrectLanguageOffset);
if (elt == null) return psiFile.getLanguage();
if (elt instanceof PsiWhiteSpace) {
final int incremented = elt.getTextRange().getEndOffset() + 1;
if (incremented <= end) {
return getLanguageAtOffset(psiFile, incremented, end);
}
}
return PsiUtilBase.findLanguageFromElement(elt);
}
@Nullable