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

IDEA-112248 Groovy: Select Word should select class body without braces

Browse Source
This commit is contained in:
Max Medvedev
2013-08-19 11:58:01 +04:00
parent 6333616f4f
commit f9795c2170
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/META-INF/plugin.xml
+1
View File
@@ -431,6 +431,7 @@
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyLiteralSelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyMembersWithDocSelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyBlockStatementsSelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyTypeDefinitionBodySelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyTypeCastSelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyDocParamsSelectioner"/>
<extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyArgListSelectioner"/>
plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java
+68
View File
@@ -0,0 +1,68 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.editor.selection;
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinitionBody;
import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
import java.util.List;
/**
* Created by Max Medvedev on 8/19/13
*/
public class GroovyTypeDefinitionBodySelectioner extends ExtendWordSelectionHandlerBase {
public boolean canSelect(PsiElement e) {
return e instanceof GrTypeDefinitionBody;
}
public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
List<TextRange> result = super.select(e, editorText, cursorOffset, editor);
if (e instanceof GrTypeDefinitionBody) {
GrTypeDefinitionBody block = ((GrTypeDefinitionBody)e);
int startOffset = findOpeningBrace(block);
int endOffset = findClosingBrace(block, startOffset);
TextRange range = new TextRange(startOffset, endOffset);
result.addAll(expandToWholeLine(editorText, range));
}
return result;
}
private static int findOpeningBrace(GrTypeDefinitionBody block) {
PsiElement lbrace = block.getLBrace();
if (lbrace == null) return block.getTextRange().getStartOffset();
while (PsiImplUtil.isWhiteSpace(lbrace.getNextSibling())) {
lbrace = lbrace.getNextSibling();
}
return lbrace.getTextRange().getEndOffset();
}
private static int findClosingBrace(GrTypeDefinitionBody block, int startOffset) {
PsiElement rbrace = block.getRBrace();
if (rbrace == null) return block.getTextRange().getEndOffset();
while (PsiImplUtil.isWhiteSpace(rbrace.getPrevSibling()) && rbrace.getPrevSibling().getTextRange().getStartOffset() > startOffset) {
rbrace = rbrace.getPrevSibling();
}
return rbrace.getTextRange().getStartOffset();
}
}