EA-59548 (nullability)

diff --git a/platform/core-api/src/com/intellij/lang/TreeBackedLighterAST.java b/platform/core-api/src/com/intellij/lang/TreeBackedLighterAST.java
index 229c85f735cb99b4f3ba6bf88af0aee7c12f8efe..f04379e14e34cb5f813fd53961ee9c1adfe78caf 100644 (file)
--- a/platform/core-api/src/com/intellij/lang/TreeBackedLighterAST.java
+++ b/platform/core-api/src/com/intellij/lang/TreeBackedLighterAST.java
@@ -18,7 +18,6 @@ package com.intellij.lang;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +25,7 @@ import java.util.List;
 public class TreeBackedLighterAST extends LighterAST {
   private final FileASTNode myRoot;
 
-  public TreeBackedLighterAST(final FileASTNode root) {
+  public TreeBackedLighterAST(@NotNull FileASTNode root) {
     super(root.getCharTable());
     myRoot = root;
   }
@@ -34,7 +33,6 @@ public class TreeBackedLighterAST extends LighterAST {
   @NotNull
   @Override
   public LighterASTNode getRoot() {
-    //noinspection ConstantConditions
     return wrap(myRoot);
   }
 
@@ -57,17 +55,13 @@ public class TreeBackedLighterAST extends LighterAST {
     return result;
   }
 
-  @Nullable
-  private static LighterASTNode wrap(@Nullable final ASTNode node) {
-    if (node == null) return null;
-    if (node.getFirstChildNode() == null && node.getTextLength() > 0) {
-      return new TokenNodeWrapper(node);
-    }
-    return new NodeWrapper(node);
+  @NotNull
+  private static LighterASTNode wrap(@NotNull ASTNode node) {
+    return node.getFirstChildNode() == null && node.getTextLength() > 0 ? new TokenNodeWrapper(node) : new NodeWrapper(node);
   }
 
   @NotNull
-  public ASTNode unwrap(LighterASTNode node) {
+  public ASTNode unwrap(@NotNull LighterASTNode node) {
     return ((NodeWrapper)node).myNode;
   }