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

inplace change signature: ensure detached/keep track of document change offset being invalidated by consequence changes

Browse Source
This commit is contained in:
Anna.Kozlova
2016-11-11 12:46:01 +01:00
parent 285a6c9437
commit 29b96470b4
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDetector.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class JavaChangeSignatureDetector implements LanguageChangeSignatureDetec
}
@Override
public boolean isChangeSignatureAvailableOnElement(PsiElement element, DetectedJavaChangeInfo currentInfo) {
public boolean isChangeSignatureAvailableOnElement(@NotNull PsiElement element, DetectedJavaChangeInfo currentInfo) {
final PsiMethod method = currentInfo.getMethod();
TextRange range = method.getTextRange();
PsiCodeBlock body = method.getBody();
platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/InplaceChangeSignature.java
+6 -7
View File
@@ -19,10 +19,7 @@ import com.intellij.codeInsight.highlighting.HighlightManager;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.command.impl.FinishMarkAction;
import com.intellij.openapi.command.impl.StartMarkAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.editor.VisualPosition;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.event.DocumentEvent;
@@ -136,6 +133,7 @@ public class InplaceChangeSignature implements DocumentListener {
@Override
public void documentChanged(DocumentEvent event) {
RangeMarker marker = event.getDocument().createRangeMarker(event.getOffset(), event.getOffset());
myDocumentManager.performWhenAllCommitted(() -> {
if (myDetector == null) {
return;
@@ -144,8 +142,9 @@ public class InplaceChangeSignature implements DocumentListener {
if (file == null) {
return;
}
PsiElement element = file.findElementAt(event.getOffset());
if (myDetector.ignoreChanges(element)) return;
PsiElement element = file.findElementAt(marker.getStartOffset());
marker.dispose();
if (element == null || myDetector.ignoreChanges(element)) return;
if (element instanceof PsiWhiteSpace) {
PsiElement method = myStableChange.getMethod();
@@ -177,7 +176,6 @@ public class InplaceChangeSignature implements DocumentListener {
final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().createDialogBalloonBuilder(checkBox, null).setSmallVariant(true);
myBalloon = balloonBuilder.createBalloon();
myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
final JBPopupFactory popupFactory = JBPopupFactory.getInstance();
myBalloon.show(new PositionTracker<Balloon>(myEditor.getContentComponent()) {
@Override
public RelativePoint recalculateLocation(Balloon object) {
@@ -197,6 +195,7 @@ public class InplaceChangeSignature implements DocumentListener {
}
myHighlighters.clear();
myBalloon.hide();
myDetector = null;
FinishMarkAction.finish(myProject, myEditor, myMarkAction);
myEditor.putUserData(INPLACE_CHANGE_SIGNATURE, null);
}
platform/lang-impl/src/com/intellij/refactoring/changeSignature/inplace/LanguageChangeSignatureDetector.java
+1 -1
View File
@@ -33,7 +33,7 @@ public interface LanguageChangeSignatureDetector<C extends ChangeInfo> {
void performChange(C changeInfo, @NotNull String oldText);
boolean isChangeSignatureAvailableOnElement(PsiElement element, C currentInfo);
boolean isChangeSignatureAvailableOnElement(@NotNull PsiElement element, C currentInfo);
TextRange getHighlightingRange(@NotNull C changeInfo);