MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-07-02 12:48:37 +03:00
parent 3e7cafec3c
commit 784d53709b
7 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/lang/PsiBuilder.java
+7 -5
View File
@@ -140,6 +140,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
*
* @return the new marker instance.
*/
@NotNull
Marker precede();
/**
@@ -160,7 +161,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
*
* @param type the type of the node in the AST tree.
*/
void done(IElementType type);
void done(@NotNull IElementType type);
/**
* Like {@linkplain #done(IElementType)}, but collapses all tokens between start and end markers
@@ -168,7 +169,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
*
* @param type the type of the node in the AST tree.
*/
void collapse(IElementType type);
void collapse(@NotNull IElementType type);
/**
* Like {@linkplain #done(IElementType)}, but the marker is completed (end marker inserted)
@@ -178,7 +179,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
* @param type the type of the node in the AST tree.
* @param before marker to complete this one before.
*/
void doneBefore(IElementType type, Marker before);
void doneBefore(@NotNull IElementType type, @NotNull Marker before);
/**
* Like {@linkplain #doneBefore(IElementType, Marker)}, but in addition an error element with given text
@@ -188,7 +189,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
* @param before marker to complete this one before.
* @param errorMessage for error element.
*/
void doneBefore(IElementType type, Marker before, String errorMessage);
void doneBefore(@NotNull IElementType type, @NotNull Marker before, String errorMessage);
/**
* Completes this marker and labels it as error element with specified message. Before calling this method,
@@ -204,7 +205,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
* @param message for error element.
* @param before marker to complete this one before.
*/
void errorBefore(String message, Marker before);
void errorBefore(String message, @NotNull Marker before);
/**
* Allows to define custom edge token binders instead of default ones. If any of parameters is null
@@ -222,6 +223,7 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
*
* @return the new marker instance.
*/
@NotNull
Marker mark();
/**
platform/core-api/src/com/intellij/lang/PsiParser.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -38,5 +38,5 @@ public interface PsiParser {
* @return the root of the resulting AST tree.
*/
@NotNull
ASTNode parse(IElementType root, PsiBuilder builder);
ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder builder);
}
platform/core-api/src/com/intellij/lang/WhitespacesAndCommentsBinder.java
+3 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -16,6 +16,7 @@
package com.intellij.lang;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -31,6 +32,7 @@ public interface WhitespacesAndCommentsBinder {
* Provides an ability for the processor to get a text of any of given tokens.
*/
interface TokenTextGetter {
@NotNull
CharSequence get(int i);
}
platform/core-impl/src/com/intellij/lang/impl/DelegateMarker.java
+7 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -35,6 +35,7 @@ public abstract class DelegateMarker implements PsiBuilder.Marker {
return myDelegate;
}
@NotNull
@Override
public PsiBuilder.Marker precede() {
return myDelegate.precede();
@@ -51,22 +52,22 @@ public abstract class DelegateMarker implements PsiBuilder.Marker {
}
@Override
public void done(IElementType type) {
public void done(@NotNull IElementType type) {
myDelegate.done(type);
}
@Override
public void collapse(IElementType type) {
public void collapse(@NotNull IElementType type) {
myDelegate.collapse(type);
}
@Override
public void doneBefore(IElementType type, PsiBuilder.Marker before) {
public void doneBefore(@NotNull IElementType type, @NotNull PsiBuilder.Marker before) {
myDelegate.doneBefore(type, before);
}
@Override
public void doneBefore(IElementType type, PsiBuilder.Marker before, String errorMessage) {
public void doneBefore(@NotNull IElementType type, @NotNull PsiBuilder.Marker before, String errorMessage) {
myDelegate.doneBefore(type, before, errorMessage);
}
@@ -76,7 +77,7 @@ public abstract class DelegateMarker implements PsiBuilder.Marker {
}
@Override
public void errorBefore(String message, PsiBuilder.Marker before) {
public void errorBefore(String message, @NotNull PsiBuilder.Marker before) {
myDelegate.errorBefore(message, before);
}
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderAdapter.java
+1
View File
@@ -101,6 +101,7 @@ public class PsiBuilderAdapter implements PsiBuilder {
return myDelegate.getCurrentOffset();
}
@NotNull
@Override
public Marker mark() {
return myDelegate.mark();
platform/lang-api/src/com/intellij/codeInsight/daemon/NavigateAction.java
+7 -5
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.ShortcutSet;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.awt.event.MouseEvent;
@@ -28,10 +29,10 @@ import java.awt.event.MouseEvent;
* @author Dmitry Avdeev
*/
public class NavigateAction<T extends PsiElement> extends AnAction {
private LineMarkerInfo<T> myInfo;
private final LineMarkerInfo<T> myInfo;
public NavigateAction(String text,
LineMarkerInfo<T> info,
public NavigateAction(@NotNull String text,
@NotNull LineMarkerInfo<T> info,
@Nullable String originalActionId) {
super(text);
myInfo = info;
@@ -41,7 +42,7 @@ public class NavigateAction<T extends PsiElement> extends AnAction {
}
}
public NavigateAction(LineMarkerInfo<T> info) {
public NavigateAction(@NotNull LineMarkerInfo<T> info) {
myInfo = info;
}
@@ -56,7 +57,8 @@ public class NavigateAction<T extends PsiElement> extends AnAction {
}
}
public static <T extends PsiElement> LineMarkerInfo<T> setNavigateAction(LineMarkerInfo<T> info, String text, @Nullable String originalActionId) {
@NotNull
public static <T extends PsiElement> LineMarkerInfo<T> setNavigateAction(@NotNull LineMarkerInfo<T> info, @NotNull String text, @Nullable String originalActionId) {
NavigateAction<T> action = new NavigateAction<T>(text, info, originalActionId);
info.setNavigateAction(action);
return info;
xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java
+3 -2
View File
@@ -222,6 +222,7 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
return true;
}
@NotNull
@Override
public Marker mark() {
// In the case of the topmost node all should be inserted
@@ -344,12 +345,12 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
}
@Override
public void doneBefore(IElementType type, Marker before) {
public void doneBefore(@NotNull IElementType type, @NotNull Marker before) {
super.doneBefore(type, getDelegateOrThis(before));
}
@Override
public void doneBefore(IElementType type, Marker before, String errorMessage) {
public void doneBefore(@NotNull IElementType type, @NotNull Marker before, String errorMessage) {
super.doneBefore(type, getDelegateOrThis(before), errorMessage);
}