diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaIdIndexer.java b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaIdIndexer.java
index d4ff75acee52..dad725526498 100644
--- a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaIdIndexer.java
+++ b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaIdIndexer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lang.java.JavaParserDefinition;
@@ -20,10 +6,12 @@ import com.intellij.lexer.Lexer;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class JavaIdIndexer extends LexerBasedIdIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(final OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull final OccurrenceConsumer consumer) {
     return createIndexingLexer(consumer);
   }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaTodoIndexer.java b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaTodoIndexer.java
index 4c05f3807b68..0dd6f7fc8a4f 100644
--- a/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaTodoIndexer.java
+++ b/java/java-impl/src/com/intellij/psi/impl/cache/impl/idCache/JavaTodoIndexer.java
@@ -1,28 +1,16 @@
-/*
- * Copyright 2000-2009 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.IdAndToDoScannerBasedOnFilterLexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class JavaTodoIndexer extends LexerBasedTodoIndexer implements IdAndToDoScannerBasedOnFilterLexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return JavaIdIndexer.createIndexingLexer(consumer);
   }
 }
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
index c089622d3233..6ce47d860848 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IdAndToDoScannerBasedOnFilterLexer.java
@@ -1,23 +1,11 @@
-/*
- * Copyright 2000-2011 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl;
 
 import com.intellij.lexer.Lexer;
+import org.jetbrains.annotations.NotNull;
 
 public interface IdAndToDoScannerBasedOnFilterLexer {
   // lexer should be the same
-  Lexer createLexer(OccurrenceConsumer consumer);
+  @NotNull
+  Lexer createLexer(@NotNull OccurrenceConsumer consumer);
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyTodoIndexer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyTodoIndexer.java
index c9daf9280738..e5f1bc73ad6c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyTodoIndexer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyTodoIndexer.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2000-2011 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.groovy.highlighter;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyFilterLexer;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyLexer;
 
@@ -25,8 +12,9 @@ import org.jetbrains.plugins.groovy.lang.lexer.GroovyLexer;
  * @author Maxim.Medvedev
  */
 public class GroovyTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return new GroovyFilterLexer(new GroovyLexer(), consumer);
   }
 }
diff --git a/plugins/markdown/src/org/intellij/plugins/markdown/highlighting/MarkdownTodoIndexer.java b/plugins/markdown/src/org/intellij/plugins/markdown/highlighting/MarkdownTodoIndexer.java
index 0d4cff515551..29453d1a8fab 100644
--- a/plugins/markdown/src/org/intellij/plugins/markdown/highlighting/MarkdownTodoIndexer.java
+++ b/plugins/markdown/src/org/intellij/plugins/markdown/highlighting/MarkdownTodoIndexer.java
@@ -1,16 +1,4 @@
-// Copyright 2000-2018 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.
-// 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.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.intellij.plugins.markdown.highlighting;
 
 import com.intellij.lexer.Lexer;
@@ -18,10 +6,12 @@ import com.intellij.psi.impl.cache.impl.BaseFilterLexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
 import com.intellij.psi.search.UsageSearchContext;
+import org.jetbrains.annotations.NotNull;
 
 public class MarkdownTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return new BaseFilterLexer(new MarkdownHighlightingLexer(), consumer) {
       @Override
       public void advance() {
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesIdIndexer.java b/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesIdIndexer.java
index 272c35a46729..c45197c650d3 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesIdIndexer.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesIdIndexer.java
@@ -1,31 +1,19 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lang.properties.parsing.PropertiesLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Maxim.Mossienko
  */
 public class PropertiesIdIndexer extends LexerBasedIdIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(final OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull final OccurrenceConsumer consumer) {
     return createIndexingLexer(consumer);
   }
 
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesTodoIndexer.java b/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesTodoIndexer.java
index 19fa8101dd93..6195592efbec 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesTodoIndexer.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/PropertiesTodoIndexer.java
@@ -1,30 +1,18 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Maxim.Mossienko
  */
 public class PropertiesTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return PropertiesIdIndexer.createIndexingLexer(consumer);
   }
 }
diff --git a/python/rest/src/com/jetbrains/rest/RestTodoIndexer.java b/python/rest/src/com/jetbrains/rest/RestTodoIndexer.java
index 232c2bca15b4..c2099ced51ef 100644
--- a/python/rest/src/com/jetbrains/rest/RestTodoIndexer.java
+++ b/python/rest/src/com/jetbrains/rest/RestTodoIndexer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.jetbrains.rest;
 
 import com.intellij.lexer.Lexer;
@@ -22,13 +8,15 @@ import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
 import com.intellij.psi.search.UsageSearchContext;
 import com.intellij.psi.tree.IElementType;
 import com.jetbrains.rest.lexer.RestFlexLexer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author traff
  */
 public class RestTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return new BaseFilterLexer(new RestFlexLexer(), consumer) {
       @Override
       public void advance() {
diff --git a/python/src/com/jetbrains/python/PyTodoIndexer.java b/python/src/com/jetbrains/python/PyTodoIndexer.java
index 5d11bd8dc2c0..adf3169b2aa6 100644
--- a/python/src/com/jetbrains/python/PyTodoIndexer.java
+++ b/python/src/com/jetbrains/python/PyTodoIndexer.java
@@ -1,30 +1,18 @@
-/*
- * Copyright 2000-2017 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.jetbrains.python;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author traff
  */
 public class PyTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return PyIdIndexer.Companion.createIndexingLexer(consumer);
   }
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java
index 8ffd09975d4e..4caa5ee30d01 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.HtmlHighlightingLexer;
@@ -6,10 +6,12 @@ import com.intellij.lexer.Lexer;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class HtmlIdIndexer extends LexerBasedIdIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(final OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull final OccurrenceConsumer consumer) {
     return createIndexingLexer(consumer);
   }
 
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java
index d7f931b79264..25bc78c0ae23 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlTodoIndexer.java
@@ -1,13 +1,15 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class HtmlTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return HtmlIdIndexer.createIndexingLexer(consumer);
   }
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java
index f1952c6102e9..fac1f8db9a9b 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlIdIndexer.java
@@ -1,28 +1,16 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.lexer.XHtmlHighlightingLexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class XHtmlIdIndexer extends LexerBasedIdIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(final OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull final OccurrenceConsumer consumer) {
     return createIndexingLexer(consumer);
   }
 
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java
index a445d1a3a4e3..6b8a060a2d11 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XHtmlTodoIndexer.java
@@ -1,27 +1,15 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class XHtmlTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return XHtmlIdIndexer.createIndexingLexer(consumer);
   }
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java
index 502f8af8d9f8..98e807752107 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlIdIndexer.java
@@ -1,28 +1,16 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.lexer.XmlLexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class XmlIdIndexer extends LexerBasedIdIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(final OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull final OccurrenceConsumer consumer) {
     return createIndexingLexer(consumer);
   }
 
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java
index bd6537876594..d84b532105ff 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/cache/impl/idCache/XmlTodoIndexer.java
@@ -1,27 +1,15 @@
-/*
- * Copyright 2000-2014 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.
- * 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.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.impl.cache.impl.idCache;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
 import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
+import org.jetbrains.annotations.NotNull;
 
 public class XmlTodoIndexer extends LexerBasedTodoIndexer {
+  @NotNull
   @Override
-  public Lexer createLexer(OccurrenceConsumer consumer) {
+  public Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
     return XmlIdIndexer.createIndexingLexer(consumer);
   }
 }