notnull

java/java-structure-view/src/com/intellij/lang/java/JavaStructureViewBuilderFactory.java

@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 public class JavaStructureViewBuilderFactory implements PsiStructureViewFactory {
   @Override
   @Nullable
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     if (!(psiFile instanceof PsiJavaFile)) return null;
     return new TreeBasedStructureViewBuilder() {
       @Override

json/src/com/intellij/json/structureView/JsonStructureViewBuilderFactory.java

@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
 public class JsonStructureViewBuilderFactory implements PsiStructureViewFactory {
   @Nullable
   @Override
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     if (!(psiFile instanceof JsonFile)) {
       return null;
     }

platform/core-api/src/com/intellij/lang/CompositeLanguage.java

@@ -48,7 +48,7 @@ public class CompositeLanguage extends Language {
   }
 
   @NotNull
-  public Language[] getLanguageExtensionsForFile(final PsiFile psi) {
+  public Language[] getLanguageExtensionsForFile(@NotNull PsiFile psi) {
     final List<Language> extensions = new ArrayList<>(1);
     for (LanguageFilter filter : myFilters) {
       if (filter.isRelevantForFile(psi)) extensions.add(filter.getLanguage());

platform/editor-ui-api/src/com/intellij/lang/PsiStructureViewFactory.java

@@ -21,16 +21,17 @@ package com.intellij.lang;
 
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Should be registered as language extension
  * @see LanguageStructureViewBuilder
  */
+@FunctionalInterface
 public interface PsiStructureViewFactory {
-
   String EP_NAME = "com.intellij.lang.psiStructureViewFactory";
 
   @Nullable
-  StructureViewBuilder getStructureViewBuilder(PsiFile psiFile);
+  StructureViewBuilder getStructureViewBuilder(@NotNull PsiFile psiFile);
 }

plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesStructureViewBuilderFactory.java

@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 public class PropertiesStructureViewBuilderFactory implements PsiStructureViewFactory {
   @Override
   @NotNull
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new StructureViewBuilder() {
       @Override
       @NotNull

plugins/yaml/src/org/jetbrains/yaml/structureView/YAMLStructureViewFactory.java

@@ -3,13 +3,14 @@ package org.jetbrains.yaml.structureView;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.lang.PsiStructureViewFactory;
 import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.yaml.psi.YAMLFile;
 
 /**
  * @author oleg
  */
 public class YAMLStructureViewFactory implements PsiStructureViewFactory {
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new YAMLStructureViewBuilder((YAMLFile) psiFile);
   }
 }

python/rest/src/com/jetbrains/rest/structureView/RestStructureViewFactory.java

@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class RestStructureViewFactory implements PsiStructureViewFactory {
   @Override
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
 
       @Override

python/src/com/jetbrains/python/structureView/PyStructureViewFactory.java

@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class PyStructureViewFactory implements PsiStructureViewFactory {
   @Override
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
 
       @Override

xml/xml-structure-view-impl/src/com/intellij/lang/dtd/DtdStructureViewBuilderFactory.java

@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 public class DtdStructureViewBuilderFactory implements PsiStructureViewFactory {
   @Override
   @NotNull
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
       @Override
       @NotNull

xml/xml-structure-view-impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java

@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
 public class XmlStructureViewBuilderFactory implements PsiStructureViewFactory {
   @Override
   @Nullable
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     if (!(psiFile instanceof XmlFile)) {
       return null;
     }
@@ -67,7 +67,7 @@ public class XmlStructureViewBuilderFactory implements PsiStructureViewFactory {
   }
 
   @Nullable
-  private static StructureViewBuilder getStructureViewBuilderForExtensions(final PsiFile psiFile) {
+  private static StructureViewBuilder getStructureViewBuilderForExtensions(@NotNull PsiFile psiFile) {
     for (Language language : XMLLanguage.INSTANCE.getLanguageExtensionsForFile(psiFile)) {
       PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(language);
       if (factory == null) continue;