GitOrigin-RevId: 5e21a5f4b85e506bcf78a738672bbf6a4f926490
This commit is contained in:
Alexey Kudravtsev
2020-03-26 14:01:38 +00:00
committed by intellij-monorepo-bot
parent 24b56ae920
commit 3d59865c73
3 changed files with 6 additions and 8 deletions
@@ -97,9 +97,7 @@ public class HighlightNamesUtil {
PsiMethodCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(elementToHighlight, PsiMethodCallExpression.class);
if (methodCallExpression != null) {
PsiElement qualifier = methodCallExpression.getMethodExpression().getQualifier();
if (qualifier == null || qualifier instanceof PsiThisExpression) {
return true;
}
return qualifier == null || qualifier instanceof PsiThisExpression;
}
return false;
}
@@ -326,7 +324,7 @@ public class HighlightNamesUtil {
return textRange.getStartOffset();
}
static HighlightInfo highlightPackage(@NotNull PsiElement resolved, @NotNull PsiJavaCodeReferenceElement elementToHighlight, @NotNull TextAttributesScheme scheme) {
static @NotNull HighlightInfo highlightPackage(@NotNull PsiElement resolved, @NotNull PsiJavaCodeReferenceElement elementToHighlight, @NotNull TextAttributesScheme scheme) {
PsiElement referenceNameElement = elementToHighlight.getReferenceNameElement();
TextRange range;
if (referenceNameElement == null) {
@@ -140,7 +140,7 @@ public class Alarm implements Disposable {
}
}
public void addRequest(@NotNull final Runnable request, final int delay, boolean runWithActiveFrameOnly) {
public void addRequest(@NotNull Runnable request, int delayMillis, boolean runWithActiveFrameOnly) {
if (runWithActiveFrameOnly && !ApplicationManager.getApplication().isActive()) {
final MessageBus bus = ApplicationManager.getApplication().getMessageBus();
final MessageBusConnection connection = bus.connect(this);
@@ -148,12 +148,12 @@ public class Alarm implements Disposable {
@Override
public void applicationActivated(@NotNull IdeFrame ideFrame) {
connection.disconnect();
addRequest(request, delay);
addRequest(request, delayMillis);
}
});
}
else {
addRequest(request, delay);
addRequest(request, delayMillis);
}
}
@@ -133,7 +133,7 @@ public abstract class Node extends DefaultMutableTreeNode {
void insertNewNode(@NotNull Node newChild, int childIndex) {
ApplicationManager.getApplication().assertIsDispatchThread();
if (children == null) {
children = new Vector();
children = new Vector<Node>();
}
//noinspection unchecked
children.insertElementAt(newChild, childIndex);