Skip to content

Commit

Permalink
Highlight statements for which break statements break out of fix #2033
Browse files Browse the repository at this point in the history
(cherry picked from commit 6dcdfa4)
  • Loading branch information
ilinum authored and ignatov committed Dec 25, 2015
1 parent 85858b7 commit be092b5
Show file tree
Hide file tree
Showing 6 changed files with 392 additions and 114 deletions.
114 changes: 0 additions & 114 deletions src/com/goide/highlighting/GoHighlightExitPointsHandlerFactory.java

This file was deleted.

133 changes: 133 additions & 0 deletions src/com/goide/highlighting/exitpoint/BreakStmtExitPointHandler.java
@@ -0,0 +1,133 @@
/*
* Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan
*
* 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.goide.highlighting.exitpoint;

import com.goide.psi.*;
import com.goide.psi.impl.GoPsiImplUtil;
import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Consumer;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;

class BreakStmtExitPointHandler extends HighlightUsagesHandlerBase<PsiElement> {
private final PsiElement myTarget;
@Nullable private final GoBreakStatement myBreakStmt;
@Nullable private PsiElement myOwner;

private BreakStmtExitPointHandler(Editor editor,
PsiFile file,
PsiElement target,
@Nullable GoBreakStatement breakStmt,
@Nullable PsiElement owner) {
super(editor, file);
myTarget = target;
myBreakStmt = breakStmt;
myOwner = owner;
}

@NotNull
@Override
public List<PsiElement> getTargets() {
return ContainerUtil.newSmartList(myTarget);
}

@Override
protected void selectTargets(List<PsiElement> targets, @NotNull Consumer<List<PsiElement>> selectionConsumer) {
selectionConsumer.consume(targets);
}

@Override
public void computeUsages(List<PsiElement> targets) {
final PsiElement breakStmtOwner;
if (myOwner != null) {
breakStmtOwner = myOwner;
}
else if (myBreakStmt != null) {
breakStmtOwner = GoPsiImplUtil.getBreakStatementOwner(myBreakStmt);
}
else {
breakStmtOwner = null;
}
GoRecursiveVisitor visitor = new GoRecursiveVisitor() {
@Override
public void visitLabelDefinition(@NotNull GoLabelDefinition o) {
if (o == breakStmtOwner) {
addOccurrence(o);
}
super.visitLabelDefinition(o);
}

@Override
public void visitBreakStatement(@NotNull GoBreakStatement o) {
if (o == myBreakStmt || GoPsiImplUtil.getBreakStatementOwner(o) == breakStmtOwner) {
addOccurrence(o);
}
super.visitBreakStatement(o);
}

@Override
public void visitSwitchStatement(@NotNull GoSwitchStatement o) {
if (o == breakStmtOwner) {
GoSwitchStart switchStart = o.getSwitchStart();
if (switchStart != null) {
addOccurrence(switchStart.getSwitch());
}
}
super.visitSwitchStatement(o);
}

@Override
public void visitForStatement(@NotNull GoForStatement o) {
if (o == breakStmtOwner) {
addOccurrence(o.getFor());
}
super.visitForStatement(o);
}

@Override
public void visitSelectStatement(@NotNull GoSelectStatement o) {
if (o == breakStmtOwner) {
addOccurrence(o.getSelect());
}
super.visitSelectStatement(o);
}
};
if (breakStmtOwner != null) {
PsiElement parent = breakStmtOwner.getParent();
if (parent instanceof GoCompositeElement) {
visitor.visitCompositeElement(((GoCompositeElement)parent));
}
}
}

@Nullable
public static BreakStmtExitPointHandler createForElement(@NotNull Editor editor, @NotNull PsiFile file, @NotNull PsiElement element) {
PsiElement target =
PsiTreeUtil.getParentOfType(element, GoBreakStatement.class, GoSwitchStatement.class, GoSelectStatement.class, GoForStatement.class);
if (target instanceof GoBreakStatement) {
return new BreakStmtExitPointHandler(editor, file, element, (GoBreakStatement)target, null);
}
return new BreakStmtExitPointHandler(editor, file, element, null, target);
}
}
85 changes: 85 additions & 0 deletions src/com/goide/highlighting/exitpoint/FunctionExitPointHandler.java
@@ -0,0 +1,85 @@
/*
* Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan
*
* 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.goide.highlighting.exitpoint;

import com.goide.GoTypes;
import com.goide.psi.*;
import com.goide.psi.impl.GoPsiImplUtil;
import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Consumer;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;

class FunctionExitPointHandler extends HighlightUsagesHandlerBase<PsiElement> {
private final PsiElement myTarget;
private final GoTypeOwner myFunction;

private FunctionExitPointHandler(Editor editor, PsiFile file, PsiElement target, GoTypeOwner function) {
super(editor, file);
myTarget = target;
myFunction = function;
}

@NotNull
@Override
public List<PsiElement> getTargets() {
return ContainerUtil.newSmartList(myTarget);
}

@Override
protected void selectTargets(List<PsiElement> targets, @NotNull Consumer<List<PsiElement>> selectionConsumer) {
selectionConsumer.consume(targets);
}

@Override
public void computeUsages(List<PsiElement> targets) {
if (myTarget instanceof LeafPsiElement && ((LeafPsiElement)myTarget).getElementType() == GoTypes.FUNC) {
addOccurrence(myTarget);
}
new GoRecursiveVisitor() {
@Override
public void visitFunctionLit(@NotNull GoFunctionLit literal) {
}

@Override
public void visitReturnStatement(@NotNull GoReturnStatement statement) {
addOccurrence(statement);
}

@Override
public void visitCallExpr(@NotNull GoCallExpr o) {
if (GoPsiImplUtil.isPanic(o)) addOccurrence(o);
super.visitCallExpr(o);
}
}.visitTypeOwner(myFunction);
}

@Nullable
public static FunctionExitPointHandler createForElement(@NotNull Editor editor, PsiFile file, PsiElement element) {
GoTypeOwner function = PsiTreeUtil.getParentOfType(element, GoFunctionLit.class, GoFunctionOrMethodDeclaration.class);
if (function == null) return null;
return new FunctionExitPointHandler(editor, file, element, function);
}
}
@@ -0,0 +1,62 @@
/*
* Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan
*
* 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.goide.highlighting.exitpoint;

import com.goide.GoTypes;
import com.goide.psi.GoCallExpr;
import com.goide.psi.GoReferenceExpression;
import com.goide.psi.impl.GoPsiImplUtil;
import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase;
import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerFactoryBase;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

class GoHighlightExitPointsHandlerFactory extends HighlightUsagesHandlerFactoryBase {
@Nullable
@Override
public HighlightUsagesHandlerBase createHighlightUsagesHandler(@NotNull Editor editor,
@NotNull PsiFile file,
@NotNull PsiElement target) {
if (target instanceof LeafPsiElement) {
IElementType elementType = ((LeafPsiElement)target).getElementType();
if (elementType == GoTypes.RETURN || elementType == GoTypes.FUNC || isPanicCall(target)) {
return FunctionExitPointHandler.createForElement(editor, file, target);
}
else if (elementType == GoTypes.BREAK ||
elementType == GoTypes.SWITCH ||
elementType == GoTypes.FOR ||
elementType == GoTypes.SELECT) {
return BreakStmtExitPointHandler.createForElement(editor, file, target);
}
}
return null;
}

private static boolean isPanicCall(@NotNull PsiElement e) {
PsiElement parent = e.getParent();
if (parent instanceof GoReferenceExpression) {
PsiElement grandPa = parent.getParent();
if (grandPa instanceof GoCallExpr) return GoPsiImplUtil.isPanic((GoCallExpr)grandPa);
}
return false;
}
}

0 comments on commit be092b5

Please sign in to comment.