IDEA-163970 Extend selection in block comments

This commit is contained in:
Dmitry Batrak
2016-11-23 13:04:52 +03:00
parent 006101f5f7
commit 98e7a391f0
2 changed files with 50 additions and 0 deletions
@@ -0,0 +1,49 @@
/*
* Copyright 2000-2016 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 com.intellij.codeInsight.editorActions.wordSelection;
import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler;
import com.intellij.lang.Commenter;
import com.intellij.lang.LanguageCommenters;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiDocCommentBase;
import com.intellij.psi.PsiElement;
import java.util.Collections;
import java.util.List;
public class BlockCommentSelectioner implements ExtendWordSelectionHandler {
@Override
public boolean canSelect(PsiElement e) {
return e instanceof PsiComment && !(e instanceof PsiDocCommentBase);
}
@Override
public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(e.getLanguage());
if (commenter == null) return null;
String blockStart = commenter.getBlockCommentPrefix();
String blockEnd = commenter.getBlockCommentSuffix();
if (blockStart == null || blockEnd == null) return null;
String elementText = e.getText();
if (elementText == null || !elementText.startsWith(blockStart) || !elementText.endsWith(blockEnd)) return null;
TextRange elementRange = e.getTextRange();
return Collections.singletonList(new TextRange(elementRange.getStartOffset() + blockStart.length(),
elementRange.getEndOffset() - blockEnd.length()));
}
}
@@ -620,6 +620,7 @@
<extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.NaturalLanguageTextSelectioner"/>
<extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.WordSelectioner"/>
<extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.LineCommentSelectioner"/>
<extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.BlockCommentSelectioner"/>
<extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.InjectedReferenceSelectioner"/>
<extendWordSelectionHandler implementation="com.intellij.ide.highlighter.custom.impl.CustomFileTypeSelectWordHandler"/>