diff --git a/json/intellij.json.iml b/json/intellij.json.iml
index 859b5352fe94..942c75702e64 100644
--- a/json/intellij.json.iml
+++ b/json/intellij.json.iml
@@ -19,6 +19,7 @@
+
diff --git a/json/src/com/intellij/json/findUsages/JsonFindUsagesProvider.java b/json/src/com/intellij/json/findUsages/JsonFindUsagesProvider.java
index c1aecbed1029..721b3c3b710a 100644
--- a/json/src/com/intellij/json/findUsages/JsonFindUsagesProvider.java
+++ b/json/src/com/intellij/json/findUsages/JsonFindUsagesProvider.java
@@ -11,10 +11,7 @@ import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-/**
- * @author Mikhail Golubev
- */
-public final class JsonFindUsagesProvider implements FindUsagesProvider {
+final class JsonFindUsagesProvider implements FindUsagesProvider {
@Override
public @Nullable WordsScanner getWordsScanner() {
return new JsonWordScanner();
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 3128ee633d89..a5e382247749 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -40,8 +40,8 @@
-
-
+
+
diff --git a/platform/testFramework/common/intellij.platform.testFramework.common.iml b/platform/testFramework/common/intellij.platform.testFramework.common.iml
index daa009d2e844..a4cd7a49e854 100644
--- a/platform/testFramework/common/intellij.platform.testFramework.common.iml
+++ b/platform/testFramework/common/intellij.platform.testFramework.common.iml
@@ -12,6 +12,7 @@
+
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 4ac59611888b..6393e8b2c65b 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -15,6 +15,7 @@
+
diff --git a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
index 00a8ad85f47d..03508239e20a 100644
--- a/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
+++ b/platform/vcs-impl/lang/intellij.platform.vcs.impl.lang.iml
@@ -10,6 +10,7 @@
+
diff --git a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
index 96ebd844334c..929f2859d65f 100644
--- a/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.testFramework.iml
@@ -13,6 +13,7 @@
+
diff --git a/platform/vcs-tests/intellij.platform.vcs.tests.iml b/platform/vcs-tests/intellij.platform.vcs.tests.iml
index 99371f84df6e..8d6941ef106d 100644
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -17,6 +17,7 @@
+
diff --git a/platform/warmup/intellij.platform.warmup.iml b/platform/warmup/intellij.platform.warmup.iml
index fab3ba915f7d..1950e892eae9 100644
--- a/platform/warmup/intellij.platform.warmup.iml
+++ b/platform/warmup/intellij.platform.warmup.iml
@@ -13,6 +13,7 @@
+
diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml
index 3e1b3f88fd2f..5402d4f79962 100644
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -20,6 +20,7 @@
+
diff --git a/plugins/editorconfig/intellij.editorconfig.iml b/plugins/editorconfig/intellij.editorconfig.iml
index 8ab697ae0e98..3970fdde83e9 100644
--- a/plugins/editorconfig/intellij.editorconfig.iml
+++ b/plugins/editorconfig/intellij.editorconfig.iml
@@ -45,6 +45,7 @@
+
diff --git a/plugins/editorconfig/src/org/editorconfig/language/codeinsight/findusages/EditorConfigFindUsagesProvider.kt b/plugins/editorconfig/src/org/editorconfig/language/codeinsight/findusages/EditorConfigFindUsagesProvider.kt
index 6364983401d4..1e56666abc8e 100644
--- a/plugins/editorconfig/src/org/editorconfig/language/codeinsight/findusages/EditorConfigFindUsagesProvider.kt
+++ b/plugins/editorconfig/src/org/editorconfig/language/codeinsight/findusages/EditorConfigFindUsagesProvider.kt
@@ -12,7 +12,7 @@ import org.editorconfig.language.schema.descriptors.impl.EditorConfigConstantDes
import org.editorconfig.language.schema.descriptors.impl.EditorConfigDeclarationDescriptor
import org.editorconfig.language.schema.descriptors.impl.EditorConfigReferenceDescriptor
-class EditorConfigFindUsagesProvider : FindUsagesProvider {
+private class EditorConfigFindUsagesProvider : FindUsagesProvider {
override fun getWordsScanner(): WordsScanner = EditorConfigWordScanner()
override fun canFindUsagesFor(psiElement: PsiElement) = psiElement is EditorConfigDescribableElement
override fun getHelpId(psiElement: PsiElement): String = HelpID.FIND_OTHER_USAGES
diff --git a/plugins/htmltools/intellij.html.tools.iml b/plugins/htmltools/intellij.html.tools.iml
index 078ee2ccc511..cf8ed0613a46 100644
--- a/plugins/htmltools/intellij.html.tools.iml
+++ b/plugins/htmltools/intellij.html.tools.iml
@@ -12,6 +12,7 @@
+
diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml
index fd90624b59ba..798c957099ab 100644
--- a/plugins/markdown/core/intellij.markdown.iml
+++ b/plugins/markdown/core/intellij.markdown.iml
@@ -13,6 +13,7 @@
+
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
index 88354f616d9a..316803faee98 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -11,6 +11,7 @@
+
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
index f2f0150215d5..9f8a2d27c7a5 100644
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
+++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/DumpProjectFiles.kt
@@ -1,7 +1,6 @@
package com.jetbrains.performancePlugin.commands
import com.intellij.openapi.application.runReadAction
-import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.Task
@@ -57,7 +56,7 @@ class DumpProjectFiles(text: String, line: Int) : AbstractCommand(text, line) {
}
companion object {
- const val PREFIX = CMD_PREFIX + "dumpProjectFiles"
+ internal const val PREFIX = CMD_PREFIX + "dumpProjectFiles"
private val LOG = logger()
diff --git a/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml b/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml
index 1578b4659929..d13c1a915c25 100644
--- a/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml
+++ b/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/idCache/PropertiesTodoIndexer.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/idCache/PropertiesTodoIndexer.java
index c77bbf64561b..cf4c436b4587 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/idCache/PropertiesTodoIndexer.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/idCache/PropertiesTodoIndexer.java
@@ -6,7 +6,7 @@ import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
import com.intellij.psi.impl.cache.impl.todo.LexerBasedTodoIndexer;
import org.jetbrains.annotations.NotNull;
-public final class PropertiesTodoIndexer extends LexerBasedTodoIndexer {
+public class PropertiesTodoIndexer extends LexerBasedTodoIndexer {
@Override
public @NotNull Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
return PropertiesIdIndexer.createIndexingLexer(consumer);
diff --git a/plugins/restructuredtext/intellij.restructuredtext.iml b/plugins/restructuredtext/intellij.restructuredtext.iml
index 68e2aa38b4ec..6755cbec0f0f 100644
--- a/plugins/restructuredtext/intellij.restructuredtext.iml
+++ b/plugins/restructuredtext/intellij.restructuredtext.iml
@@ -14,6 +14,7 @@
+
diff --git a/plugins/restructuredtext/src/com/intellij/restructuredtext/RestIndexPatternBuilder.java b/plugins/restructuredtext/src/com/intellij/restructuredtext/RestIndexPatternBuilder.java
index 2ab889237eee..ef4d6c425036 100644
--- a/plugins/restructuredtext/src/com/intellij/restructuredtext/RestIndexPatternBuilder.java
+++ b/plugins/restructuredtext/src/com/intellij/restructuredtext/RestIndexPatternBuilder.java
@@ -10,7 +10,7 @@ import com.intellij.restructuredtext.lexer.RestFlexLexer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-public class RestIndexPatternBuilder implements IndexPatternBuilder {
+final class RestIndexPatternBuilder implements IndexPatternBuilder {
public static final TokenSet COMMENTS = TokenSet.create(RestTokenTypes.COMMENT);
@Override
diff --git a/plugins/restructuredtext/src/com/intellij/restructuredtext/RestTodoIndexer.java b/plugins/restructuredtext/src/com/intellij/restructuredtext/RestTodoIndexer.java
index ee9c2e6b1d54..3af0c3b5f80d 100644
--- a/plugins/restructuredtext/src/com/intellij/restructuredtext/RestTodoIndexer.java
+++ b/plugins/restructuredtext/src/com/intellij/restructuredtext/RestTodoIndexer.java
@@ -10,7 +10,7 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.restructuredtext.lexer.RestFlexLexer;
import org.jetbrains.annotations.NotNull;
-public class RestTodoIndexer extends LexerBasedTodoIndexer {
+final class RestTodoIndexer extends LexerBasedTodoIndexer {
@Override
public @NotNull Lexer createLexer(@NotNull OccurrenceConsumer consumer) {
return new BaseFilterLexer(new RestFlexLexer(), consumer) {
diff --git a/plugins/sh/core/intellij.sh.core.iml b/plugins/sh/core/intellij.sh.core.iml
index b84acb3b4010..d66ce7546756 100644
--- a/plugins/sh/core/intellij.sh.core.iml
+++ b/plugins/sh/core/intellij.sh.core.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/sh/core/src/com/intellij/sh/codeInsight/ShFindUsagesProvider.java b/plugins/sh/core/src/com/intellij/sh/codeInsight/ShFindUsagesProvider.java
index e50f9fad0483..7d6e894fc1b6 100644
--- a/plugins/sh/core/src/com/intellij/sh/codeInsight/ShFindUsagesProvider.java
+++ b/plugins/sh/core/src/com/intellij/sh/codeInsight/ShFindUsagesProvider.java
@@ -15,10 +15,9 @@ import org.jetbrains.annotations.Nullable;
import static com.intellij.sh.lexer.ShTokenTypes.*;
-public class ShFindUsagesProvider implements FindUsagesProvider {
-
+final class ShFindUsagesProvider implements FindUsagesProvider {
@Override
- public @Nullable WordsScanner getWordsScanner() {
+ public @NotNull WordsScanner getWordsScanner() {
return new DefaultWordsScanner(new ShLexer(), TokenSet.create(WORD), commentTokens, literals);
}
diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml
index 3adac06baa31..5d8aad8fab20 100644
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -37,6 +37,7 @@
+
diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMatePatternBuilder.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMatePatternBuilder.java
index 07aa1d206b5e..51706b64ac66 100644
--- a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMatePatternBuilder.java
+++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMatePatternBuilder.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.textmate.psi.TextMateFile;
-public class TextMatePatternBuilder implements IndexPatternBuilder {
+public final class TextMatePatternBuilder implements IndexPatternBuilder {
@Override
public @Nullable Lexer getIndexingLexer(@NotNull PsiFile file) {
return file instanceof TextMateFile ? new EmptyLexer() : null;
diff --git a/plugins/toml/core/intellij.toml.core.iml b/plugins/toml/core/intellij.toml.core.iml
index 9d02226f55e5..a07535d6a656 100644
--- a/plugins/toml/core/intellij.toml.core.iml
+++ b/plugins/toml/core/intellij.toml.core.iml
@@ -9,6 +9,7 @@
+
diff --git a/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexPatternBuilder.kt b/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexPatternBuilder.kt
index 71338c42b2e3..61c7f3e660a5 100644
--- a/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexPatternBuilder.kt
+++ b/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexPatternBuilder.kt
@@ -14,7 +14,7 @@ import org.toml.lang.lexer.TomlLexer
import org.toml.lang.psi.TOML_COMMENTS
import org.toml.lang.psi.TomlFile
-class TomlTodoIndexPatternBuilder : IndexPatternBuilder {
+private class TomlTodoIndexPatternBuilder : IndexPatternBuilder {
override fun getIndexingLexer(file: PsiFile): Lexer? = if (file is TomlFile) TomlLexer() else null
override fun getCommentTokenSet(file: PsiFile): TokenSet? = if (file is TomlFile) TOML_COMMENTS else null
override fun getCommentStartDelta(tokenType: IElementType?): Int = if (tokenType in TOML_COMMENTS) 1 else 0
diff --git a/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexer.kt b/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexer.kt
index 657d43b1007b..dad52abdb631 100644
--- a/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexer.kt
+++ b/plugins/toml/core/src/main/kotlin/org/toml/ide/todo/TomlTodoIndexer.kt
@@ -13,7 +13,7 @@ import com.intellij.psi.search.UsageSearchContext
import org.toml.lang.lexer.TomlLexer
import org.toml.lang.psi.TOML_COMMENTS
-class TomlTodoIndexer : LexerBasedTodoIndexer() {
+private class TomlTodoIndexer : LexerBasedTodoIndexer() {
override fun createLexer(consumer: OccurrenceConsumer): Lexer = object : BaseFilterLexer(TomlLexer(), consumer) {
override fun advance() {
if (myDelegate.tokenType in TOML_COMMENTS) {
diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml
index 301348666009..65e371a85084 100644
--- a/plugins/xpath/intellij.xpath.iml
+++ b/plugins/xpath/intellij.xpath.iml
@@ -15,6 +15,7 @@
+
diff --git a/plugins/xslt-debugger/intellij.xslt.debugger.iml b/plugins/xslt-debugger/intellij.xslt.debugger.iml
index e0ec06219746..e093bd1f770a 100644
--- a/plugins/xslt-debugger/intellij.xslt.debugger.iml
+++ b/plugins/xslt-debugger/intellij.xslt.debugger.iml
@@ -17,6 +17,7 @@
+
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
index 8b4600be8846..2d74727e1785 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
@@ -20,7 +20,7 @@ import org.intellij.lang.xpath.xslt.impl.XsltChecker;
import org.intellij.plugins.xsltDebugger.impl.XsltDebuggerEditorsProvider;
import org.jetbrains.annotations.NotNull;
-public class XsltBreakpointType extends XLineBreakpointType {
+public final class XsltBreakpointType extends XLineBreakpointType {
private final XsltDebuggerEditorsProvider myMyEditorsProvider1 = new XsltDebuggerEditorsProvider(XsltChecker.LanguageLevel.V1);
private final XsltDebuggerEditorsProvider myMyEditorsProvider2 = new XsltDebuggerEditorsProvider(XsltChecker.LanguageLevel.V2);
diff --git a/plugins/yaml/intellij.yaml.iml b/plugins/yaml/intellij.yaml.iml
index 509378c71059..87a89cd7c527 100644
--- a/plugins/yaml/intellij.yaml.iml
+++ b/plugins/yaml/intellij.yaml.iml
@@ -17,6 +17,7 @@
+
diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLFindUsagesProvider.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLFindUsagesProvider.java
index 32adb9624cad..3532f7deaac0 100644
--- a/plugins/yaml/src/org/jetbrains/yaml/YAMLFindUsagesProvider.java
+++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLFindUsagesProvider.java
@@ -8,7 +8,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.yaml.psi.*;
/**
@@ -16,7 +15,7 @@ import org.jetbrains.yaml.psi.*;
*/
public class YAMLFindUsagesProvider implements FindUsagesProvider {
@Override
- public @Nullable WordsScanner getWordsScanner() {
+ public @NotNull WordsScanner getWordsScanner() {
return new YAMLWordsScanner();
}
@@ -26,7 +25,7 @@ public class YAMLFindUsagesProvider implements FindUsagesProvider {
}
@Override
- public @Nullable String getHelpId(@NotNull PsiElement psiElement) {
+ public @NotNull String getHelpId(@NotNull PsiElement psiElement) {
return HelpID.FIND_OTHER_USAGES;
}
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index f540131c60e8..ab18490e1055 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -16,6 +16,7 @@
+
diff --git a/xml/dom-impl/intellij.xml.dom.impl.iml b/xml/dom-impl/intellij.xml.dom.impl.iml
index 7dc35956ff07..f84e7c5fa0c7 100644
--- a/xml/dom-impl/intellij.xml.dom.impl.iml
+++ b/xml/dom-impl/intellij.xml.dom.impl.iml
@@ -14,6 +14,7 @@
+
diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml
index 2781ae36a4c1..e1d33462bdae 100644
--- a/xml/impl/intellij.xml.impl.iml
+++ b/xml/impl/intellij.xml.impl.iml
@@ -15,6 +15,7 @@
+
diff --git a/xml/relaxng/intellij.relaxng.iml b/xml/relaxng/intellij.relaxng.iml
index 97fa69462b30..1ac3d33b9def 100644
--- a/xml/relaxng/intellij.relaxng.iml
+++ b/xml/relaxng/intellij.relaxng.iml
@@ -70,6 +70,7 @@
+